diff -Nru indicator-sound-gtk2-12.10.0.1/debian/changelog indicator-sound-gtk2-12.10.0.1/debian/changelog --- indicator-sound-gtk2-12.10.0.1/debian/changelog 2013-06-07 21:53:13.000000000 +0100 +++ indicator-sound-gtk2-12.10.0.1/debian/changelog 2013-12-05 04:33:08.000000000 +0000 @@ -1,3 +1,12 @@ +indicator-sound-gtk2 (12.10.0.1-0ubuntu2.3) saucy; urgency=low + + * Make this actually work. (LP: #1208204) + - Make the Gtk2 indicator use a different DBus name, so that the + indicator-sound-service from this package is loaded instead of + the Gtk3 one which is incompatible. + + -- Alistair Buxton Thu, 05 Dec 2013 03:56:36 +0000 + indicator-sound-gtk2 (12.10.0.1-0ubuntu2) saucy; urgency=low * debian/control: diff -Nru indicator-sound-gtk2-12.10.0.1/debian/patches/series indicator-sound-gtk2-12.10.0.1/debian/patches/series --- indicator-sound-gtk2-12.10.0.1/debian/patches/series 2012-07-12 19:03:45.000000000 +0100 +++ indicator-sound-gtk2-12.10.0.1/debian/patches/series 2013-12-05 04:05:20.000000000 +0000 @@ -1,3 +1,4 @@ sound_nua.patch sound_xubuntu.patch sound_ubuntustudio.patch +use-gtk2-service.patch diff -Nru indicator-sound-gtk2-12.10.0.1/debian/patches/use-gtk2-service.patch indicator-sound-gtk2-12.10.0.1/debian/patches/use-gtk2-service.patch --- indicator-sound-gtk2-12.10.0.1/debian/patches/use-gtk2-service.patch 1970-01-01 01:00:00.000000000 +0100 +++ indicator-sound-gtk2-12.10.0.1/debian/patches/use-gtk2-service.patch 2013-12-08 02:23:55.000000000 +0000 @@ -0,0 +1,40 @@ +Description: Make this indicator actually work. + Make the Gtk2 indicator use a different DBus name, so that the + indicator-sound-service from this package is loaded instead of + the Gtk3 one which is incompatible. +Author: Alistair Buxton +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1208204 + +Index: indicator-sound-gtk2-12.10.0.1/data/indicator-sound.service.in +=================================================================== +--- indicator-sound-gtk2-12.10.0.1.orig/data/indicator-sound.service.in 2013-12-05 04:05:20.882591080 +0000 ++++ indicator-sound-gtk2-12.10.0.1/data/indicator-sound.service.in 2013-12-05 04:05:23.286457158 +0000 +@@ -1,3 +1,3 @@ + [D-BUS Service] +-Name=com.canonical.indicator.sound ++Name=com.canonical.indicator.sound-gtk2 + Exec=@libexecdir@/indicator-sound-service +Index: indicator-sound-gtk2-12.10.0.1/src/dbus-shared-names.h +=================================================================== +--- indicator-sound-gtk2-12.10.0.1.orig/src/dbus-shared-names.h 2013-12-05 04:05:20.882591080 +0000 ++++ indicator-sound-gtk2-12.10.0.1/src/dbus-shared-names.h 2013-12-05 04:05:23.578440890 +0000 +@@ -25,7 +25,7 @@ + #ifndef __DBUS_SHARED_NAMES_H__ + #define __DBUS_SHARED_NAMES_H__ + +-#define INDICATOR_SOUND_DBUS_NAME "com.canonical.indicator.sound" ++#define INDICATOR_SOUND_DBUS_NAME "com.canonical.indicator.sound-gtk2" + #define INDICATOR_SOUND_MENU_DBUS_OBJECT_PATH "/com/canonical/indicator/sound/menu" + #define INDICATOR_SOUND_SERVICE_DBUS_OBJECT_PATH "/com/canonical/indicator/sound/service" + #define INDICATOR_SOUND_DBUS_INTERFACE "com.canonical.indicator.sound" +Index: indicator-sound-gtk2-12.10.0.1/src/sound-service.xml +=================================================================== +--- indicator-sound-gtk2-12.10.0.1.orig/src/sound-service.xml 2013-12-05 04:05:20.882591080 +0000 ++++ indicator-sound-gtk2-12.10.0.1/src/sound-service.xml 2013-12-05 04:05:23.838426407 +0000 +@@ -1,5 +1,5 @@ + +- ++ + + + diff -Nru indicator-sound-gtk2-12.10.0.1/debian/rules indicator-sound-gtk2-12.10.0.1/debian/rules --- indicator-sound-gtk2-12.10.0.1/debian/rules 2012-09-09 13:25:12.000000000 +0100 +++ indicator-sound-gtk2-12.10.0.1/debian/rules 2013-12-05 04:05:20.000000000 +0000 @@ -12,7 +12,8 @@ common-install-arch:: find debian/indicator-sound-gtk2 -name \*.la -delete # only ship the .so file and depend on indicator-sound for the rest - rm -rf debian/indicator-sound-gtk2/usr/share/dbus-1/ + #rm -rf debian/indicator-sound-gtk2/usr/share/dbus-1/ + mv debian/indicator-sound-gtk2/usr/share/dbus-1/services/indicator-sound.service debian/indicator-sound-gtk2/usr/share/dbus-1/services/indicator-sound-gtk2.service rm -rf debian/indicator-sound-gtk2/usr/share/libindicator/ rm -rf debian/indicator-sound-gtk2/usr/share/glib-2.0/ rm -rf debian/indicator-sound-gtk2/usr/lib/indicator-sound/