r44874 - in /desktop/experimental/gnome-settings-daemon/debian: changelog patches/04_superP.patch

[pochu at users.alioth.debian.org]

Author: pochu
Date: Sat May 30 20:42:05 2015
New Revision: 44874

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=44874
Log:
* debian/patches/04_superP.patch:
  + Updated for the new version.

Modified:
    desktop/experimental/gnome-settings-daemon/debian/changelog
    desktop/experimental/gnome-settings-daemon/debian/patches/04_superP.patch

Modified: desktop/experimental/gnome-settings-daemon/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-settings-daemon/debian/changelog?rev=44874&op=diff
==============================================================================
--- desktop/experimental/gnome-settings-daemon/debian/changelog	[utf-8] (original)
+++ desktop/experimental/gnome-settings-daemon/debian/changelog	[utf-8] Sat May 30 20:42:05 2015
@@ -6,6 +6,8 @@
   * debian/patches/30_xrandr_dbus_init.patch,
     debian/patches/power-make-sure-to-set-an-error-when-GDBus-set_prope.patch:
     + Dropped, merged upstream.
+  * debian/patches/04_superP.patch:
+    + Updated for the new version.
 
  -- Emilio Pozuelo Monfort <pochu at debian.org>  Sat, 30 May 2015 22:31:54 +0200
 

Modified: desktop/experimental/gnome-settings-daemon/debian/patches/04_superP.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-settings-daemon/debian/patches/04_superP.patch?rev=44874&op=diff
==============================================================================
--- desktop/experimental/gnome-settings-daemon/debian/patches/04_superP.patch	[utf-8] (original)
+++ desktop/experimental/gnome-settings-daemon/debian/patches/04_superP.patch	[utf-8] Sat May 30 20:42:05 2015
@@ -2,11 +2,9 @@
 Bug: https://bugzilla.gnome.org/show_bug.cgi?id=651571
 Bug: https://bugzilla.gnome.org/show_bug.cgi?id=669423
 
-Index: gnome-settings-daemon-3.7.91/data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in
-===================================================================
---- gnome-settings-daemon-3.7.91.orig/data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in	2013-03-08 14:33:20.000000000 +0000
-+++ gnome-settings-daemon-3.7.91/data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in	2013-03-08 14:33:20.000000000 +0000
-@@ -85,6 +85,11 @@
+--- a/data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in
++++ b/data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in
+@@ -90,6 +90,11 @@
        <_summary>Stop playback</_summary>
        <_description>Binding to stop playback.</_description>
      </key>
@@ -18,16 +16,14 @@
      <key name="volume-down" type="s">
        <default>'XF86AudioLowerVolume'</default>
        <_summary>Volume down</_summary>
-Index: gnome-settings-daemon-3.7.91/plugins/media-keys/shortcuts-list.h
-===================================================================
---- gnome-settings-daemon-3.7.91.orig/plugins/media-keys/shortcuts-list.h	2013-03-08 14:33:20.000000000 +0000
-+++ gnome-settings-daemon-3.7.91/plugins/media-keys/shortcuts-list.h	2013-03-08 14:34:41.000000000 +0000
-@@ -132,7 +132,7 @@
-         { FORWARD_KEY, NULL, N_("Forward"), "XF86AudioForward", SHELL_KEYBINDING_MODE_ALL },
-         { REPEAT_KEY, NULL, N_("Repeat"), "XF86AudioRepeat", SHELL_KEYBINDING_MODE_ALL },
-         { RANDOM_KEY, NULL, N_("Random Play"), "XF86AudioRandomPlay", SHELL_KEYBINDING_MODE_ALL },
--        { VIDEO_OUT_KEY, NULL, N_("Video Out"), "<Super>p", SHELL_KEYBINDING_MODE_ALL },
-+        { VIDEO_OUT_KEY, "video-out", N_("Video Out"), NULL, SHELL_KEYBINDING_MODE_ALL },
+--- a/plugins/media-keys/shortcuts-list.h
++++ b/plugins/media-keys/shortcuts-list.h
+@@ -81,7 +81,7 @@
+         { FORWARD_KEY, NULL, N_("Forward"), "XF86AudioForward", SHELL_ACTION_MODE_ALL },
+         { REPEAT_KEY, NULL, N_("Repeat"), "XF86AudioRepeat", SHELL_ACTION_MODE_ALL },
+         { RANDOM_KEY, NULL, N_("Random Play"), "XF86AudioRandomPlay", SHELL_ACTION_MODE_ALL },
+-        { VIDEO_OUT_KEY, NULL, N_("Video Out"), "<Super>p", SHELL_ACTION_MODE_ALL },
++        { VIDEO_OUT_KEY, "video-out", N_("Video Out"), NULL, SHELL_ACTION_MODE_ALL },
          /* Key code of the XF86Display key (Fn-F7 on Thinkpads, Fn-F4 on HP machines, etc.) */
-         { VIDEO_OUT_KEY, NULL, N_("Video Out"), "XF86Display", SHELL_KEYBINDING_MODE_ALL },
+         { VIDEO_OUT_KEY, NULL, N_("Video Out"), "XF86Display", SHELL_ACTION_MODE_ALL },
          /* Key code of the XF86RotateWindows key (present on some tablets) */