4 files changed, 10 insertions, 151 deletions
diff --git a/debian/changelog b/debian/changelog
index 8835e39..5ea8538 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+indicator-sound (0.8.1.0-0ubuntu1) UNRELEASED; urgency=low
+
+  * New upstream release.
+    - No easy way to turn the sound menu on/off (lp: #829648)
+    - Avoid spawning notification daemon at startup (lp: #912150)
+    - Creation of album-art-cache folder (lp: #799383)
+    - schema id & path are inconsistent with other indicators (lp: #914377)
+
+ -- Sebastien Bacher <seb128@ubuntu.com>  Tue, 14 Feb 2012 19:29:14 +0100
+
 indicator-sound (0.8.0.0-0ubuntu4) precise; urgency=low
 
   * debian/patches/sound_nua.patch
diff --git a/debian/patches/dbusmenu_05_90.patch b/debian/patches/dbusmenu_05_90.patch
deleted file mode 100644
index c477c68..0000000
--- a/debian/patches/dbusmenu_05_90.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-=== modified file 'configure.ac'
---- old/configure.ac	2012-01-13 13:43:00 +0000
-+++ new/configure.ac	2012-02-01 03:15:46 +0000
-@@ -42,7 +42,7 @@
- GTK_REQUIRED_VERSION=2.22
- GTK3_REQUIRED_VERSION=3.0
- INDICATOR_REQUIRED_VERSION=0.3.19
--DBUSMENUGTK_REQUIRED_VERSION=0.3.101
-+DBUSMENUGTK_REQUIRED_VERSION=0.5.90
- POLKIT_REQUIRED_VERSION=0.92
- PULSE_AUDIO_REQUIRED_VERSION=0.9.19
- INDICATOR_DISPLAY_OBJECTS=0.1.11
-
-=== modified file 'src/indicator-sound.c'
---- old/src/indicator-sound.c	2012-01-25 02:57:50 +0000
-+++ new/src/indicator-sound.c	2012-02-01 03:20:44 +0000
-@@ -23,11 +23,7 @@
- #include <glib/gi18n.h>
- #include <gtk/gtk.h>
- #include <gdk/gdkkeysyms.h>
--#if GTK_CHECK_VERSION(3, 0, 0)
--#include <libdbusmenu-gtk3/menu.h>
--#else
- #include <libdbusmenu-gtk/menu.h>
--#endif
- #include <libido/idoscalemenuitem.h>
- 
- #include <gio/gio.h>
-
-=== modified file 'src/metadata-widget.h'
---- old/src/metadata-widget.h	2011-06-22 19:19:49 +0000
-+++ new/src/metadata-widget.h	2012-02-01 03:20:44 +0000
-@@ -20,11 +20,7 @@
- #define __METADATA_WIDGET_H__
- 
- #include <gtk/gtk.h>
--#if GTK_CHECK_VERSION(3, 0, 0)
--#include <libdbusmenu-gtk3/menuitem.h>
--#else
- #include <libdbusmenu-gtk/menuitem.h>
--#endif
- 
- G_BEGIN_DECLS
- 
-
-=== modified file 'src/mute-widget.h'
---- old/src/mute-widget.h	2011-07-17 02:40:00 +0000
-+++ new/src/mute-widget.h	2012-02-01 03:20:44 +0000
-@@ -22,11 +22,7 @@
- #include <glib.h>
- #include <glib-object.h>
- #include <gtk/gtk.h>
--#if GTK_CHECK_VERSION(3, 0, 0)
--#include <libdbusmenu-gtk3/menuitem.h>
--#else
- #include <libdbusmenu-gtk/menuitem.h>
--#endif
- #include <libindicator/indicator-object.h>
- 
- G_BEGIN_DECLS
-
-=== modified file 'src/transport-widget.h'
---- old/src/transport-widget.h	2011-06-22 19:19:49 +0000
-+++ new/src/transport-widget.h	2012-02-01 03:20:44 +0000
-@@ -20,11 +20,7 @@
- #define __TRANSPORT_WIDGET_H__
- 
- #include <gtk/gtk.h>
--#if GTK_CHECK_VERSION(3, 0, 0)
--#include <libdbusmenu-gtk3/menuitem.h>
--#else
- #include <libdbusmenu-gtk/menuitem.h>
--#endif
- 
- #include "common-defs.h"
- 
-
-=== modified file 'src/voip-input-widget.h'
---- old/src/voip-input-widget.h	2011-06-22 19:19:49 +0000
-+++ new/src/voip-input-widget.h	2012-02-01 03:20:44 +0000
-@@ -22,11 +22,7 @@
- #include <glib.h>
- #include <glib-object.h>
- #include <gtk/gtk.h>
--#if GTK_CHECK_VERSION(3, 0, 0)
--#include <libdbusmenu-gtk3/menuitem.h>
--#else
- #include <libdbusmenu-gtk/menuitem.h>
--#endif
- 
- G_BEGIN_DECLS
- 
-
-=== modified file 'src/volume-widget.h'
---- old/src/volume-widget.h	2011-06-22 19:19:49 +0000
-+++ new/src/volume-widget.h	2012-02-01 03:20:44 +0000
-@@ -22,11 +22,7 @@
- #include <glib.h>
- #include <glib-object.h>
- #include <gtk/gtk.h>
--#if GTK_CHECK_VERSION(3, 0, 0)
--#include <libdbusmenu-gtk3/menuitem.h>
--#else
- #include <libdbusmenu-gtk/menuitem.h>
--#endif
- #include <libindicator/indicator-object.h>
- 
- G_BEGIN_DECLS
-
diff --git a/debian/patches/lazy_init.patch b/debian/patches/lazy_init.patch
deleted file mode 100644
index cc0fe17..0000000
--- a/debian/patches/lazy_init.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Description: Avoid spawning notification daemon right at startup, instead initialize it lazily when actually doing a notification. Improves boot speed.
-Bug: https://launchpad.net/bugs/912150
-Author: Martin Pitt <martin.pitt@ubuntu.com>
-Forwarded: https://code.launchpad.net/~pitti/indicator-sound/lazy-notification-init/+merge/87576
-
---- a/src/sound-state-manager.c	2011-04-05 03:14:19 +0000
-+++ b/src/sound-state-manager.c	2012-01-05 08:46:07 +0000
-@@ -80,8 +80,6 @@
- 
-   priv->settings_manager = g_settings_new("com.canonical.indicators.sound");
- 
--  sound_state_manager_notification_init (self);
--  
-   sound_state_manager_prepare_state_image_names (self);
-   sound_state_manager_prepare_blocked_animation (self);
- 
-@@ -134,6 +132,13 @@
- static void
- sound_state_manager_notification_init (SoundStateManager* self)
- {
-+  static gboolean initialized = FALSE;
-+
-+  /* one-time lazy initialization */
-+  if (initialized)
-+    return;
-+  initialized = TRUE;
-+
-   SoundStateManagerPrivate* priv = SOUND_STATE_MANAGER_GET_PRIVATE(self);
- 
-   if (!notify_init(PACKAGE_NAME))
-@@ -164,6 +169,8 @@
- {
-   SoundStateManagerPrivate* priv = SOUND_STATE_MANAGER_GET_PRIVATE(self);
- 
-+  sound_state_manager_notification_init (self);
-+  
-   if (priv->notification == NULL || 
-       g_settings_get_boolean (priv->settings_manager, "show-notify-osd-on-scroll") == FALSE){
-     return;
-
diff --git a/debian/patches/series b/debian/patches/series
index 424fc6e..650058b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
-lazy_init.patch
 sound_nua.patch
-dbusmenu_05_90.patch