r37141 - in /desktop/experimental/gnome-settings-daemon/debian: changelog patches/05_disable_cursor_manager.patch patches/series

[sjoerd at users.alioth.debian.org]

Author: sjoerd
Date: Sat Mar 23 12:29:26 2013
New Revision: 37141

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=37141
Log:
* New upstream release (3.7.92)
* debian/patches/05_disable_cursor_manager.patch
  + Added. Disable the cursor manager, causes crashes with Xorg 1.12. Remove
  once Xorg 1.14 is available or when bgo#696118 is fixed upstream

Added:
    desktop/experimental/gnome-settings-daemon/debian/patches/05_disable_cursor_manager.patch
Modified:
    desktop/experimental/gnome-settings-daemon/debian/changelog
    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=37141&op=diff
==============================================================================
--- desktop/experimental/gnome-settings-daemon/debian/changelog [utf-8] (original)
+++ desktop/experimental/gnome-settings-daemon/debian/changelog [utf-8] Sat Mar 23 12:29:26 2013
@@ -1,4 +1,4 @@
-gnome-settings-daemon (3.7.91-1) UNRELEASED; urgency=low
+gnome-settings-daemon (3.7.92-1) UNRELEASED; urgency=low
 
   [ Andreas Henriksson ]
   * New upstream release
@@ -18,8 +18,12 @@
   * debian/control.in: Break gnome-control-center (<< 3.7) as the DateTime
     mechanism is now dropped.
   * debian/control.in: Remove gstreamer build-depends, no longer needed
-
- -- Sjoerd Simons <sjoerd at debian.org>  Mon, 18 Mar 2013 20:40:56 +0100
+  * New upstream release (3.7.92)
+  * debian/patches/05_disable_cursor_manager.patch
+    + Added. Disable the cursor manager, causes crashes with Xorg 1.12. Remove
+    once Xorg 1.14 is available or when bgo#696118 is fixed upstream
+
+ -- Sjoerd Simons <sjoerd at debian.org>  Sat, 23 Mar 2013 13:15:01 +0100
 
 gnome-settings-daemon (3.6.4-1) experimental; urgency=low
 

Added: desktop/experimental/gnome-settings-daemon/debian/patches/05_disable_cursor_manager.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-settings-daemon/debian/patches/05_disable_cursor_manager.patch?rev=37141&op=file
==============================================================================
--- desktop/experimental/gnome-settings-daemon/debian/patches/05_disable_cursor_manager.patch (added)
+++ desktop/experimental/gnome-settings-daemon/debian/patches/05_disable_cursor_manager.patch [utf-8] Sat Mar 23 12:29:26 2013
@@ -1,0 +1,14 @@
+diff --git a/plugins/cursor/gsd-cursor-manager.c b/plugins/cursor/gsd-cursor-manager.c
+index 611392b..563169c 100644
+--- a/plugins/cursor/gsd-cursor-manager.c
++++ b/plugins/cursor/gsd-cursor-manager.c
+@@ -260,6 +260,9 @@ gsd_cursor_manager_start (GsdCursorManager *manager,
+         g_debug ("Starting cursor manager");
+         gnome_settings_profile_start (NULL);
+ 
++        g_debug ("Not starting curor manager, assuming old X server");
++        return FALSE;
++
+         if (supports_cursor_xfixes () == FALSE) {
+                 g_debug ("XFixes cursor extension not available, will not hide the cursor");
+                 return FALSE;

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=37141&op=diff
==============================================================================
--- desktop/experimental/gnome-settings-daemon/debian/patches/series [utf-8] (original)
+++ desktop/experimental/gnome-settings-daemon/debian/patches/series [utf-8] Sat Mar 23 12:29:26 2013
@@ -1,1 +1,1 @@
-04_superP.patch
+05_disable_cursor_manager.patch