r34873 - in /desktop/experimental/gnome-settings-daemon/debian: changelog patches/01-xrandr-correct-the-type-of-the-rotation-parameter.patch patches/02-lock-screensaver-on-lid-close.patch patches/04_superP.patch patches/series

[sjoerd at users.alioth.debian.org]

Author: sjoerd
Date: Tue May 15 06:29:57 2012
New Revision: 34873

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=34873
Log:
* New upstream release
* d/p/01-xrandr-correct-the-type-of-the-rotation-parameter.patch:
  + Removed, fixed upstream
* 02-lock-screensaver-on-lid-close.patch:
  + Removed, fixed upstream
* debian/patches/04_superP.patch: Refreshed

Removed:
    desktop/experimental/gnome-settings-daemon/debian/patches/01-xrandr-correct-the-type-of-the-rotation-parameter.patch
    desktop/experimental/gnome-settings-daemon/debian/patches/02-lock-screensaver-on-lid-close.patch
Modified:
    desktop/experimental/gnome-settings-daemon/debian/changelog
    desktop/experimental/gnome-settings-daemon/debian/patches/04_superP.patch
    desktop/experimental/gnome-settings-daemon/debian/patches/series

Modified: desktop/experimental/gnome-settings-daemon/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-settings-daemon/debian/changelog?rev=34873&op=diff
==============================================================================
--- desktop/experimental/gnome-settings-daemon/debian/changelog [utf-8] (original)
+++ desktop/experimental/gnome-settings-daemon/debian/changelog [utf-8] Tue May 15 06:29:57 2012
@@ -1,3 +1,14 @@
+gnome-settings-daemon (3.4.1-1) UNRELEASED; urgency=low
+
+  * New upstream release
+  * d/p/01-xrandr-correct-the-type-of-the-rotation-parameter.patch:
+    + Removed, fixed upstream
+  * 02-lock-screensaver-on-lid-close.patch:
+    + Removed, fixed upstream
+  * debian/patches/04_superP.patch: Refreshed
+
+ -- Sjoerd Simons <sjoerd at debian.org>  Tue, 15 May 2012 08:28:14 +0200
+
 gnome-settings-daemon (3.2.2-3) unstable; urgency=low
 
   * Correctly lock the screensaver on lid-close when lid-close action is set

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=34873&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] Tue May 15 06:29:57 2012
@@ -1,7 +1,7 @@
-Index: gnome-settings-daemon-3.2.2/data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in
-===================================================================
---- gnome-settings-daemon-3.2.2.orig/data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in	2011-11-08 14:48:52.000000000 +0100
-+++ gnome-settings-daemon-3.2.2/data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in	2011-12-08 22:51:50.774919514 +0100
+diff --git 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
+index 6a63236..db9b2c4 100644
+--- 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
 @@ -85,6 +85,11 @@
        <_summary>Stop playback</_summary>
        <_description>Binding to stop playback.</_description>
@@ -14,34 +14,16 @@
      <key name="volume-down" type="s">
        <default>'XF86AudioLowerVolume'</default>
        <_summary>Volume down</_summary>
-Index: gnome-settings-daemon-3.2.2/plugins/media-keys/acme.h
-===================================================================
---- gnome-settings-daemon-3.2.2.orig/plugins/media-keys/acme.h	2011-11-08 14:49:07.000000000 +0100
-+++ gnome-settings-daemon-3.2.2/plugins/media-keys/acme.h	2011-12-08 22:51:50.774919514 +0100
-@@ -51,11 +51,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,
-@@ -110,12 +110,12 @@
-         { STOP_KEY, "stop", NULL, NULL },
-         { PREVIOUS_KEY, "previous", NULL, NULL },
-         { NEXT_KEY, "next", NULL, NULL },
+diff --git a/plugins/media-keys/shortcuts-list.h b/plugins/media-keys/shortcuts-list.h
+index 437ed2c..8a66902 100644
+--- a/plugins/media-keys/shortcuts-list.h
++++ b/plugins/media-keys/shortcuts-list.h
+@@ -123,7 +123,7 @@ static struct {
+         { FORWARD_KEY, NULL, "XF86AudioForward" },
+         { REPEAT_KEY, NULL, "XF86AudioRepeat" },
+         { RANDOM_KEY, NULL, "XF86AudioRandomPlay"},
+-        { VIDEO_OUT_KEY, NULL, "<Super>p" },
 +        { 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 },
+         { VIDEO_OUT_KEY, NULL, "XF86Display" },
          /* Key code of the XF86RotateWindows key (present on some tablets) */

Modified: desktop/experimental/gnome-settings-daemon/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-settings-daemon/debian/patches/series?rev=34873&op=diff
==============================================================================
--- desktop/experimental/gnome-settings-daemon/debian/patches/series [utf-8] (original)
+++ desktop/experimental/gnome-settings-daemon/debian/patches/series [utf-8] Tue May 15 06:29:57 2012
@@ -1,3 +1,1 @@
-01-xrandr-correct-the-type-of-the-rotation-parameter.patch
-02-lock-screensaver-on-lid-close.patch
 04_superP.patch