diff -Nru gnome-settings-daemon-3.8.6.1/debian/changelog gnome-settings-daemon-3.8.6.1/debian/changelog --- gnome-settings-daemon-3.8.6.1/debian/changelog 2014-03-14 00:29:49.000000000 +0000 +++ gnome-settings-daemon-3.8.6.1/debian/changelog 2014-04-09 01:39:09.000000000 +0000 @@ -1,3 +1,14 @@ +gnome-settings-daemon (3.8.6.1-0ubuntu11) trusty; urgency=medium + + [ Jackson Doak ] + * Add git_micmute.patch to add XF86AudioMicMute as a mic mute key + + [ Robert Ancell ] + * debian/patches/90_set_gmenus_xsettings.patch: + - Fix error in patch for watching Shell D-Bus names (LP: #1278467) + + -- Robert Ancell Wed, 09 Apr 2014 13:38:55 +1200 + gnome-settings-daemon (3.8.6.1-0ubuntu10) trusty; urgency=medium * gnome-settings-daemon.user-session.upstart: Use XDG_CURRENT_DESKTOP diff -Nru gnome-settings-daemon-3.8.6.1/debian/patches/90_set_gmenus_xsettings.patch gnome-settings-daemon-3.8.6.1/debian/patches/90_set_gmenus_xsettings.patch --- gnome-settings-daemon-3.8.6.1/debian/patches/90_set_gmenus_xsettings.patch 2014-03-14 00:29:49.000000000 +0000 +++ gnome-settings-daemon-3.8.6.1/debian/patches/90_set_gmenus_xsettings.patch 2014-04-09 01:39:09.000000000 +0000 @@ -102,7 +102,7 @@ +{ + notify_have_shell (manager); + manager->priv->have_unity = TRUE; -+ manager->priv->shell_name_watch_id = g_bus_watch_name (G_BUS_TYPE_SESSION, ++ manager->priv->unity_name_watch_id = g_bus_watch_name (G_BUS_TYPE_SESSION, + "com.canonical.AppMenu.Registrar", + 0, + on_unity_appeared, diff -Nru gnome-settings-daemon-3.8.6.1/debian/patches/git_micmute.patch gnome-settings-daemon-3.8.6.1/debian/patches/git_micmute.patch --- gnome-settings-daemon-3.8.6.1/debian/patches/git_micmute.patch 1970-01-01 00:00:00.000000000 +0000 +++ gnome-settings-daemon-3.8.6.1/debian/patches/git_micmute.patch 2014-04-09 01:39:09.000000000 +0000 @@ -0,0 +1,20 @@ +Author: Bastien Nocera +Origion: upstream +Description: media-keys: Add XF86AudioMicMute as a mic mute key + Needed because of https://bugs.freedesktop.org/show_bug.cgi?id=54171 being fixed +Applied-Upstream: https://git.gnome.org/browse/gnome-settings-daemon/commit/?id=3a8beaaf380a483ce33363031d8d276c371d7af1 +--- +--- + plugins/media-keys/shortcuts-list.h | 1 + + 1 file changed, 1 insertion(+) + +--- a/plugins/media-keys/shortcuts-list.h ++++ b/plugins/media-keys/shortcuts-list.h +@@ -109,6 +109,7 @@ static struct { + { VOLUME_DOWN_KEY, "volume-down", NULL, NULL, SHELL_KEYBINDING_MODE_ALL }, + { VOLUME_UP_KEY, "volume-up", NULL, NULL, SHELL_KEYBINDING_MODE_ALL }, + { MIC_MUTE_KEY, NULL, N_("Microphone Mute"), "F20", SHELL_KEYBINDING_MODE_ALL }, ++ { MIC_MUTE_KEY, NULL, N_("Microphone Mute"), "XF86AudioMicMute", SHELL_KEYBINDING_MODE_ALL }, + { MUTE_QUIET_KEY, NULL, N_("Quiet Volume Mute"), "XF86AudioMute", SHELL_KEYBINDING_MODE_ALL }, + { VOLUME_DOWN_QUIET_KEY, NULL, N_("Quiet Volume Down"), "XF86AudioLowerVolume", SHELL_KEYBINDING_MODE_ALL }, + { VOLUME_UP_QUIET_KEY, NULL, N_("Quiet Volume Up"), "XF86AudioRaiseVolume", SHELL_KEYBINDING_MODE_ALL }, diff -Nru gnome-settings-daemon-3.8.6.1/debian/patches/series gnome-settings-daemon-3.8.6.1/debian/patches/series --- gnome-settings-daemon-3.8.6.1/debian/patches/series 2014-03-14 00:29:49.000000000 +0000 +++ gnome-settings-daemon-3.8.6.1/debian/patches/series 2014-04-09 01:39:09.000000000 +0000 @@ -30,3 +30,4 @@ git_hidpi_scalling.patch git_new_screencast_keybinding.patch git_enable_auto_hidpi.patch +git_micmute.patch