r30795 - in /desktop/unstable/gnome-settings-daemon/debian: changelog patches/04_superP.patch patches/series

[joss at users.alioth.debian.org]

Author: joss
Date: Wed Oct 19 09:11:10 2011
New Revision: 30795

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=30795
Log:
04_superP.patch: new patch. Allow to reconfigure the Super-P 
shortcut which is otherwise hardcoded to VIDEO_OUT.

Added:
    desktop/unstable/gnome-settings-daemon/debian/patches/04_superP.patch
Modified:
    desktop/unstable/gnome-settings-daemon/debian/changelog
    desktop/unstable/gnome-settings-daemon/debian/patches/series

Modified: desktop/unstable/gnome-settings-daemon/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-settings-daemon/debian/changelog?rev=30795&op=diff
==============================================================================
--- desktop/unstable/gnome-settings-daemon/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-settings-daemon/debian/changelog [utf-8] Wed Oct 19 09:11:10 2011
@@ -1,11 +1,16 @@
 gnome-settings-daemon (3.0.3-4) UNRELEASED; urgency=low
 
+  [ Michael Biebl ]
   * Use the new maintscript facility in dh_installdeb to remove the obsolete
     conffiles:
     - Bump Build-Depends on debhelper to (>= 8.1.0~).
     - Add Pre-Depends: ${misc:Pre-Depends}.
     - Replace preinst/postinst/postrm scripts with a
       gnome-settings-daemon.maintscript file.
+
+  [ Josselin Mouette ]
+  * 04_superP.patch: new patch. Allow to reconfigure the Super-P 
+    shortcut which is otherwise hardcoded to VIDEO_OUT.
 
  -- Michael Biebl <biebl at debian.org>  Wed, 19 Oct 2011 09:45:33 +0200
 

Added: desktop/unstable/gnome-settings-daemon/debian/patches/04_superP.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-settings-daemon/debian/patches/04_superP.patch?rev=30795&op=file
==============================================================================
--- desktop/unstable/gnome-settings-daemon/debian/patches/04_superP.patch (added)
+++ desktop/unstable/gnome-settings-daemon/debian/patches/04_superP.patch [utf-8] Wed Oct 19 09:11:10 2011
@@ -1,0 +1,43 @@
+--- gnome-settings-daemon-2.91.93/plugins/media-keys/acme.h.orig	2011-03-31 14:27:13.298838842 +0700
++++ gnome-settings-daemon-2.91.93/plugins/media-keys/acme.h	2011-03-31 14:35:00.669362095 +0700
+@@ -47,11 +47,11 @@
+         STOP_KEY,
+         PREVIOUS_KEY,
+         NEXT_KEY,
++        VIDEO_OUT_KEY,
+         REWIND_KEY,
+         FORWARD_KEY,
+         REPEAT_KEY,
+         RANDOM_KEY,
+-        VIDEO_OUT_KEY,
+         VIDEO_OUT2_KEY,
+         ROTATE_VIDEO_KEY,
+         MAGNIFIER_KEY,
+@@ -92,12 +92,12 @@
+         { STOP_KEY, "stop", NULL, NULL },
+         { PREVIOUS_KEY, "previous", NULL, NULL },
+         { NEXT_KEY, "next", NULL, NULL },
++        { VIDEO_OUT_KEY, "video-out", NULL, NULL },
+         /* Those are not configurable in the UI */
+         { REWIND_KEY, NULL, "XF86AudioRewind", NULL },
+         { FORWARD_KEY, NULL, "XF86AudioForward", NULL },
+         { REPEAT_KEY, NULL, "XF86AudioRepeat", NULL },
+         { RANDOM_KEY, NULL, "XF86AudioRandomPlay", NULL},
+-        { VIDEO_OUT_KEY, NULL, "<Super>p", NULL },
+         /* Key code of the XF86Display key (Fn-F7 on Thinkpads, Fn-F4 on HP machines, etc.) */
+         { VIDEO_OUT2_KEY, NULL, "XF86Display", NULL },
+         /* Key code of the XF86RotateWindows key (present on some tablets) */
+--- gnome-settings-daemon-2.91.93/data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in.orig	2011-03-31 14:44:11.845107222 +0700
++++ gnome-settings-daemon-2.91.93/data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in	2011-03-31 14:43:25.644063308 +0700
+@@ -90,6 +90,11 @@
+       <_summary>Toggle touchpad</_summary>
+       <_description>Binding to enable or disable the touchpad.</_description>
+     </key>
++    <key name="video-out" type="s">
++      <default>'<Super>p'</default>
++      <_summary>Video output</_summary>
++      <_description>Binding to switch the video output device.</_description>
++    </key>
+     <key name="volume-down" type="s">
+       <default>'XF86AudioLowerVolume'</default>
+       <_summary>Volume down</_summary>

Modified: desktop/unstable/gnome-settings-daemon/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-settings-daemon/debian/patches/series?rev=30795&op=diff
==============================================================================
--- desktop/unstable/gnome-settings-daemon/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gnome-settings-daemon/debian/patches/series [utf-8] Wed Oct 19 09:11:10 2011
@@ -1,3 +1,4 @@
 01_medias_keys_dont_go_up_to_11.patch
 02_missing_format.patch
 03_deal_with_absence_of_gnome-session.patch
+04_superP.patch