aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorKen VanDine <ken.vandine@canonical.com>2012-03-30 14:07:44 -0400
committerKen VanDine <ken.vandine@canonical.com>2012-03-30 14:07:44 -0400
commitd738d091793595d86f1a2353b06bf3584b0afbf9 (patch)
tree41006b12bcb17a20ba7621279557303b0f88ca9e /debian
parenta198e844b900a514a4735cb17dd21ccf6a6a85ee (diff)
downloadayatana-indicator-sound-d738d091793595d86f1a2353b06bf3584b0afbf9.tar.gz
ayatana-indicator-sound-d738d091793595d86f1a2353b06bf3584b0afbf9.tar.bz2
ayatana-indicator-sound-d738d091793595d86f1a2353b06bf3584b0afbf9.zip
releasing version 0.8.4.1-0ubuntu4
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog8
-rw-r--r--debian/patches/series1
-rw-r--r--debian/patches/sound_xubuntu.patch17
3 files changed, 26 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index e3f7318..06092a6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+indicator-sound (0.8.4.1-0ubuntu4) precise; urgency=low
+
+ * debian/patches:
+ - sound_xubuntu.patch: added, prefer pavucontrol over xfce4-mixer on
+ Xubuntu. (lp: #961745)
+
+ -- Lionel Le Folgoc <mrpouit@ubuntu.com> Thu, 22 Mar 2012 00:17:34 +0100
+
indicator-sound (0.8.4.1-0ubuntu3) precise; urgency=low
* debian/patches/lp_960846.patch
diff --git a/debian/patches/series b/debian/patches/series
index 1fa9dfb..19a2a69 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
sound_nua.patch
+sound_xubuntu.patch
lp_945827.patch
lp_960846.patch
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";
+