4 files changed, 58 insertions, 0 deletions
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..92929c8
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+sound_nua.patch
+sound_xubuntu.patch
+sound_ubuntustudio.patch
diff --git a/debian/patches/sound_nua.patch b/debian/patches/sound_nua.patch
new file mode 100644
index 0000000..869ae24
--- /dev/null
+++ b/debian/patches/sound_nua.patch
@@ -0,0 +1,20 @@
+=== modified file 'src/sound-service-dbus.c'
+--- old/src/sound-service-dbus.c	2012-03-16 17:59:34 +0000
++++ new/src/sound-service-dbus.c	2012-03-19 14:54:30 +0000
+@@ -227,8 +227,14 @@
+                             gpointer user_data)
+ {
+   GError * error = NULL;
++  gchar* cmd;
++  if (!g_strcmp0 (g_getenv ("XDG_CURRENT_DESKTOP"), "Unity"))
++    cmd = "gnome-control-center sound-nua";
++  else
++    cmd = "gnome-control-center sound";
++
+   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(cmd, &error) && 
+       !g_spawn_command_line_async("xfce4-mixer", &error))
+   {
+     g_warning("Unable to show dialog: %s", error->message);
+
diff --git a/debian/patches/sound_ubuntustudio.patch b/debian/patches/sound_ubuntustudio.patch
new file mode 100644
index 0000000..23d27de
--- /dev/null
+++ b/debian/patches/sound_ubuntustudio.patch
@@ -0,0 +1,18 @@
+Description: Use pavucontrol on Ubuntu Studio by default
+ Xfce4-mixer uses gstreamer0.10-pulseaudio, which doesn't provide full access
+ to all audio channels, only to 'Master'.
+Author: Lionel Le Folgoc <mrpouit@ubuntu.com>
+Author: Janne Jokitalo (astraljava) <astraljava@kapsi.fi>
+Last-Update: 2012-04-03
+
+--- indicator-sound-0.8.5.0.orig/src/sound-service-dbus.c
++++ indicator-sound-0.8.5.0/src/sound-service-dbus.c
+@@ -232,6 +232,8 @@ show_sound_settings_dialog (DbusmenuMenu
+     cmd = "gnome-control-center sound-nua";
+   else if (!g_strcmp0 (g_getenv ("DESKTOP_SESSION"), "xubuntu"))
+     cmd = "pavucontrol";
++ else if (!g_strcmp0 (g_getenv ("DESKTOP_SESSION"), "ubuntustudio"))
++    cmd = "pavucontrol";
+   else
+     cmd = "gnome-control-center sound";
+ 
diff --git a/debian/patches/sound_xubuntu.patch b/debian/patches/sound_xubuntu.patch
new file mode 100644
index 0000000..bbf3db2
--- /dev/null
+++ b/debian/patches/sound_xubuntu.patch
@@ -0,0 +1,17 @@
+Description: Use pavucontrol on Xubuntu by default
+ Xfce4-mixer uses gstreamer0.10-pulseaudio, which doesn't provide full access
+ to all audio channels, only to 'Master'.
+Author: Lionel Le Folgoc <mrpouit@ubuntu.com>
+Last-Update: 2012-03-21
+
+--- indicator-sound-0.8.4.1.orig/src/sound-service-dbus.c
++++ indicator-sound-0.8.4.1/src/sound-service-dbus.c
+@@ -230,6 +230,8 @@ show_sound_settings_dialog (DbusmenuMenu
+   gchar* cmd;
+   if (!g_strcmp0 (g_getenv ("XDG_CURRENT_DESKTOP"), "Unity"))
+     cmd = "gnome-control-center sound-nua";
++  else if (!g_strcmp0 (g_getenv ("DESKTOP_SESSION"), "xubuntu"))
++    cmd = "pavucontrol";
+   else
+     cmd = "gnome-control-center sound";
+