diff options
author | Ken VanDine <ken.vandine@canonical.com> | 2012-02-09 16:49:44 -0500 |
---|---|---|
committer | Ken VanDine <ken.vandine@canonical.com> | 2012-02-09 16:49:44 -0500 |
commit | 46ce85550e1349998561f82146a3828cc94e311e (patch) | |
tree | 7f851c1a54166f17277ed279789e613181a97711 /debian/patches | |
parent | 4beadce168bb0894a2bfe195a989f348007c1031 (diff) | |
download | ayatana-indicator-sound-46ce85550e1349998561f82146a3828cc94e311e.tar.gz ayatana-indicator-sound-46ce85550e1349998561f82146a3828cc94e311e.tar.bz2 ayatana-indicator-sound-46ce85550e1349998561f82146a3828cc94e311e.zip |
releasing version 0.8.0.0-0ubuntu4
Diffstat (limited to 'debian/patches')
-rw-r--r-- | debian/patches/dbusmenu_05_90.patch | 109 | ||||
-rw-r--r-- | debian/patches/series | 2 | ||||
-rw-r--r-- | debian/patches/sound_nua.patch | 13 |
3 files changed, 124 insertions, 0 deletions
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 <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/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); + |