aboutsummaryrefslogtreecommitdiff
path: root/debian/patches
diff options
context:
space:
mode:
authorLars Uebernickel <lars.uebernickel@canonical.com>2013-07-12 09:17:03 +0000
committerTarmac <Unknown>2013-07-12 09:17:03 +0000
commit98c77c44a6c374a3fab401eb791ec4e968bf7168 (patch)
treeb81019f0a3b44512a6e033752b901165ff645089 /debian/patches
parent1f37b724c2eeb9af4d23de4b28c4ed39f50ed5a0 (diff)
parent9507f278131fc855c03a037cdba1053f958d2987 (diff)
downloadayatana-indicator-sound-98c77c44a6c374a3fab401eb791ec4e968bf7168.tar.gz
ayatana-indicator-sound-98c77c44a6c374a3fab401eb791ec4e968bf7168.tar.bz2
ayatana-indicator-sound-98c77c44a6c374a3fab401eb791ec4e968bf7168.zip
Remove gtk and dbusmenu. Sorry for the big changeset.
I'd appreciate a good deal of testing before merging this into the wild ;). Approved by Charles Kerr, PS Jenkins bot.
Diffstat (limited to 'debian/patches')
-rw-r--r--debian/patches/series3
-rw-r--r--debian/patches/sound_nua.patch20
-rw-r--r--debian/patches/sound_ubuntustudio.patch18
-rw-r--r--debian/patches/sound_xubuntu.patch17
4 files changed, 0 insertions, 58 deletions
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 92929c8..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,3 +0,0 @@
-sound_nua.patch
-sound_xubuntu.patch
-sound_ubuntustudio.patch
diff --git a/debian/patches/sound_nua.patch b/debian/patches/sound_nua.patch
deleted file mode 100644
index 869ae24..0000000
--- a/debian/patches/sound_nua.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-=== 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
deleted file mode 100644
index 23d27de..0000000
--- a/debian/patches/sound_ubuntustudio.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-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
deleted file mode 100644
index bbf3db2..0000000
--- a/debian/patches/sound_xubuntu.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-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";
-