diff -Nru gnome-bluetooth-3.2.2/debian/changelog gnome-bluetooth-3.2.2/debian/changelog --- gnome-bluetooth-3.2.2/debian/changelog 2012-03-21 20:56:56.000000000 +0000 +++ gnome-bluetooth-3.2.2/debian/changelog 2012-04-03 09:53:07.000000000 +0000 @@ -1,3 +1,10 @@ +gnome-bluetooth (3.2.2-0ubuntu5) precise; urgency=low + + * debian/patches/unity_sound_nua.patch: + - under Unity opens the new sound capplet (lp: #971692) + + -- Sebastien Bacher Tue, 03 Apr 2012 11:26:59 +0200 + gnome-bluetooth (3.2.2-0ubuntu4) precise; urgency=low * debian/patches/menu_update_on_rfkill.patch: make sure the menu gets updated diff -Nru gnome-bluetooth-3.2.2/debian/control gnome-bluetooth-3.2.2/debian/control --- gnome-bluetooth-3.2.2/debian/control 2012-03-21 20:56:59.000000000 +0000 +++ gnome-bluetooth-3.2.2/debian/control 2012-04-03 09:53:09.000000000 +0000 @@ -8,7 +8,7 @@ Priority: optional Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Debian GNOME Maintainers -Uploaders: Debian GNOME Maintainers , Michael Biebl +Uploaders: Debian GNOME Maintainers Build-Depends: debhelper (>= 8), cdbs (>= 0.4.93), dh-autoreconf, diff -Nru gnome-bluetooth-3.2.2/debian/patches/series gnome-bluetooth-3.2.2/debian/patches/series --- gnome-bluetooth-3.2.2/debian/patches/series 2012-03-21 20:56:56.000000000 +0000 +++ gnome-bluetooth-3.2.2/debian/patches/series 2012-04-03 09:53:07.000000000 +0000 @@ -7,3 +7,4 @@ start_in_classic_session.patch git_fix_automake_use.patch menu_update_on_rfkill.patch +unity_sound_nua.patch diff -Nru gnome-bluetooth-3.2.2/debian/patches/unity_sound_nua.patch gnome-bluetooth-3.2.2/debian/patches/unity_sound_nua.patch --- gnome-bluetooth-3.2.2/debian/patches/unity_sound_nua.patch 1970-01-01 00:00:00.000000000 +0000 +++ gnome-bluetooth-3.2.2/debian/patches/unity_sound_nua.patch 2012-04-03 09:53:07.000000000 +0000 @@ -0,0 +1,24 @@ +diff -Nur gnome-bluetooth-3.2.2.gnome/applet/main.c gnome-bluetooth-3.2.2/applet/main.c +--- gnome-bluetooth-3.2.2.gnome/applet/main.c 2012-04-03 11:21:40.595721658 +0200 ++++ gnome-bluetooth-3.2.2/applet/main.c 2012-04-03 11:37:40.547768115 +0200 +@@ -54,6 +54,7 @@ + #define KEYBOARD_PREFS GNOMECC " keyboard" + #define MOUSE_PREFS GNOMECC " mouse" + #define SOUND_PREFS GNOMECC " sound" ++#define SOUND_NUA_PREFS GNOMECC " sound-nua" + + enum { + CONNECTED, +@@ -195,7 +196,11 @@ + + static void sound_callback(GObject *widget, gpointer user_data) + { +- const char *command = SOUND_PREFS; ++ char *command; ++ if (!g_strcmp0 (g_getenv ("XDG_CURRENT_DESKTOP"), "Unity")) ++ command = SOUND_NUA_PREFS; ++ else ++ command = SOUND_PREFS; + + if (!g_spawn_command_line_async(command, NULL)) + g_printerr("Couldn't execute command: %s\n", command);