r31994 - in /desktop/unstable/gnome-settings-daemon/debian/patches: 01-xrandr-correct-the-type-of-the-rotation-parameter.patch 04_superP.patch

[biebl at users.alioth.debian.org]

Author: biebl
Date: Thu Dec  8 21:52:09 2011
New Revision: 31994

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=31994
Log:
Refresh patches

Modified:
    desktop/unstable/gnome-settings-daemon/debian/patches/01-xrandr-correct-the-type-of-the-rotation-parameter.patch
    desktop/unstable/gnome-settings-daemon/debian/patches/04_superP.patch

Modified: desktop/unstable/gnome-settings-daemon/debian/patches/01-xrandr-correct-the-type-of-the-rotation-parameter.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-settings-daemon/debian/patches/01-xrandr-correct-the-type-of-the-rotation-parameter.patch?rev=31994&op=diff
==============================================================================
--- desktop/unstable/gnome-settings-daemon/debian/patches/01-xrandr-correct-the-type-of-the-rotation-parameter.patch [utf-8] (original)
+++ desktop/unstable/gnome-settings-daemon/debian/patches/01-xrandr-correct-the-type-of-the-rotation-parameter.patch [utf-8] Thu Dec  8 21:52:09 2011
@@ -11,11 +11,11 @@
  plugins/xrandr/gsd-xrandr-manager.c |    4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/plugins/xrandr/gsd-xrandr-manager.c b/plugins/xrandr/gsd-xrandr-manager.c
-index a989352..83913c6 100644
---- a/plugins/xrandr/gsd-xrandr-manager.c
-+++ b/plugins/xrandr/gsd-xrandr-manager.c
-@@ -135,7 +135,7 @@ static void get_allowed_rotations_for_output (GnomeRRConfig *config,
+Index: gnome-settings-daemon-3.2.2/plugins/xrandr/gsd-xrandr-manager.c
+===================================================================
+--- gnome-settings-daemon-3.2.2.orig/plugins/xrandr/gsd-xrandr-manager.c	2011-11-08 14:48:52.000000000 +0100
++++ gnome-settings-daemon-3.2.2/plugins/xrandr/gsd-xrandr-manager.c	2011-12-08 22:51:46.606919662 +0100
+@@ -134,7 +134,7 @@
                                                int *out_num_rotations,
                                                GnomeRRRotation *out_rotations);
  static void handle_fn_f7 (GsdXrandrManager *mgr, guint32 timestamp);
@@ -24,7 +24,7 @@
  
  G_DEFINE_TYPE (GsdXrandrManager, gsd_xrandr_manager, G_TYPE_OBJECT)
  
-@@ -1414,7 +1414,7 @@ rotate_touchscreens (GsdXrandrManager *mgr,
+@@ -1413,7 +1413,7 @@
   */
  static void
  handle_rotate_windows (GsdXrandrManager *mgr,
@@ -33,6 +33,3 @@
                         guint32 timestamp)
  {
          GsdXrandrManagerPrivate *priv = mgr->priv;
--- 
-1.7.7.3
-

Modified: 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=31994&op=diff
==============================================================================
--- desktop/unstable/gnome-settings-daemon/debian/patches/04_superP.patch [utf-8] (original)
+++ desktop/unstable/gnome-settings-daemon/debian/patches/04_superP.patch [utf-8] Thu Dec  8 21:52:09 2011
@@ -1,8 +1,8 @@
-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 85438c5..c3ad6c0 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
-@@ -80,6 +80,11 @@
+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
+@@ -85,6 +85,11 @@
        <_summary>Stop playback</_summary>
        <_description>Binding to stop playback.</_description>
      </key>
@@ -14,11 +14,11 @@
      <key name="volume-down" type="s">
        <default>'XF86AudioLowerVolume'</default>
        <_summary>Volume down</_summary>
-diff --git a/plugins/media-keys/acme.h b/plugins/media-keys/acme.h
-index 54ec19b..028609a 100644
---- a/plugins/media-keys/acme.h
-+++ b/plugins/media-keys/acme.h
-@@ -51,11 +51,11 @@ typedef enum {
+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,
@@ -31,7 +31,7 @@
          VIDEO_OUT2_KEY,
          ROTATE_VIDEO_KEY,
          MAGNIFIER_KEY,
-@@ -110,12 +110,12 @@ static struct {
+@@ -110,12 +110,12 @@
          { STOP_KEY, "stop", NULL, NULL },
          { PREVIOUS_KEY, "previous", NULL, NULL },
          { NEXT_KEY, "next", NULL, NULL },