From 46ce85550e1349998561f82146a3828cc94e311e Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Thu, 9 Feb 2012 16:49:44 -0500 Subject: releasing version 0.8.0.0-0ubuntu4 --- debian/changelog | 11 ++++ debian/control | 6 +- debian/patches/dbusmenu_05_90.patch | 109 ++++++++++++++++++++++++++++++++++++ debian/patches/series | 2 + debian/patches/sound_nua.patch | 13 +++++ 5 files changed, 138 insertions(+), 3 deletions(-) create mode 100644 debian/patches/dbusmenu_05_90.patch create mode 100644 debian/patches/sound_nua.patch diff --git a/debian/changelog b/debian/changelog index 0cb0725..8835e39 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +indicator-sound (0.8.0.0-0ubuntu4) precise; urgency=low + + * debian/patches/sound_nua.patch + - open the new sound-nua panel in gnome-control-center + * debian/patches/dbusmenu_05_90.patch + - fixed FTBFS with dbusmenu 0.5.90 + * debian/control + - bump build depends for dbusmenu to >= 0.5.90 + + -- Ken VanDine Thu, 09 Feb 2012 16:49:15 -0500 + indicator-sound (0.8.0.0-0ubuntu3) precise; urgency=low * rebuild for libindicator7 diff --git a/debian/control b/debian/control index 8dea28e..296f82e 100644 --- a/debian/control +++ b/debian/control @@ -10,9 +10,9 @@ Build-Depends: debhelper (>= 7), libglib2.0-dev (>= 2.22.3), libgtk2.0-dev (>= 2.12.0), libgtk-3-dev, - libdbusmenu-glib-dev (>= 0.3.101), - libdbusmenu-gtk-dev (>= 0.3.101), - libdbusmenu-gtk3-dev (>= 0.3.101), + libdbusmenu-glib-dev (>= 0.5.90), + libdbusmenu-gtk-dev (>= 0.5.90), + libdbusmenu-gtk3-dev (>= 0.5.90), libindicator-dev (>= 0.3.90), libindicator3-dev (>= 0.3.90), libpulse-dev (>= 0.9.18), diff --git a/debian/patches/dbusmenu_05_90.patch b/debian/patches/dbusmenu_05_90.patch new file mode 100644 index 0000000..c477c68 --- /dev/null +++ b/debian/patches/dbusmenu_05_90.patch @@ -0,0 +1,109 @@ +=== 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 + #include + #include +-#if GTK_CHECK_VERSION(3, 0, 0) +-#include +-#else + #include +-#endif + #include + + #include + +=== 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 +-#if GTK_CHECK_VERSION(3, 0, 0) +-#include +-#else + #include +-#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 + #include + #include +-#if GTK_CHECK_VERSION(3, 0, 0) +-#include +-#else + #include +-#endif + #include + + 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 +-#if GTK_CHECK_VERSION(3, 0, 0) +-#include +-#else + #include +-#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 + #include + #include +-#if GTK_CHECK_VERSION(3, 0, 0) +-#include +-#else + #include +-#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 + #include + #include +-#if GTK_CHECK_VERSION(3, 0, 0) +-#include +-#else + #include +-#endif + #include + + G_BEGIN_DECLS + diff --git a/debian/patches/series b/debian/patches/series index 20dfb03..424fc6e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,3 @@ lazy_init.patch +sound_nua.patch +dbusmenu_05_90.patch diff --git a/debian/patches/sound_nua.patch b/debian/patches/sound_nua.patch new file mode 100644 index 0000000..4b31b61 --- /dev/null +++ b/debian/patches/sound_nua.patch @@ -0,0 +1,13 @@ +=== modified file 'src/sound-service-dbus.c' +--- old/src/sound-service-dbus.c 2011-08-10 16:58:49 +0000 ++++ new/src/sound-service-dbus.c 2012-02-09 21:32:58 +0000 +@@ -228,7 +228,7 @@ + { + GError * error = NULL; + if (!g_spawn_command_line_async("gnome-volume-control --page=applications", &error) && +- !g_spawn_command_line_async("gnome-control-center sound", &error) && ++ !g_spawn_command_line_async("gnome-control-center sound-nua", &error) && + !g_spawn_command_line_async("xfce4-mixer", &error)) + { + g_warning("Unable to show dialog: %s", error->message); + -- cgit v1.2.3