Merge lp:~rodrigo-moya/ubuntu/natty/gnome-settings-daemon/fix-633125 into lp:~ubuntu-desktop/gnome-settings-daemon/ubuntu

[Rodrigo Moya]

[lp:~rodrigo-moya/ubuntu/natty/gnome-settings-daemon/fix-633125]

140. By Rodrigo Moya on 2011-04-07

Added author's email address and use short bug url version

=== modified file 'debian/changelog'
--- debian/changelog	2011-03-31 16:03:43 +0000
+++ debian/changelog	2011-04-07 11:03:24 +0000
@@ -1,3 +1,10 @@
+gnome-settings-daemon (2.32.1-0ubuntu13) UNRELEASED; urgency=low
+
+  * debian/patches/05_use_xrecord.patch:
+    - Add patch to tell syndaemon to use the XRecord extension (LP: #633125)
+
+ -- Rodrigo Moya <[e-mail]>  Thu, 07 Apr 2011 12:24:07 +0200
+
 gnome-settings-daemon (2.32.1-0ubuntu12) natty; urgency=low
 
   * debian/patches/93_wait_for_xsettings.patch:

=== added file 'debian/patches/05_use_xrecord.patch'
--- debian/patches/05_use_xrecord.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/05_use_xrecord.patch	2011-04-07 11:03:24 +0000
@@ -0,0 +1,25 @@
+Description: Tell syndaemon to use the XRecord extension
+Bug-Ubuntu: https://launchpad.net/bugs/633125
+Author: Sergey Nizovtsev <[e-mail]>
+
+--- gnome-settings-daemon-2.32.1.orig/plugins/mouse/gsd-mouse-manager..c.old	2011-04-06 21:03:28.344661413 +0400
++++ gnome-settings-daemon-2.32.1/plugins/mouse/gsd-mouse-manager.c	2011-04-06 21:03:54.184699318 +0400
+@@ -548,7 +548,7 @@
+ 
+         if (state) {
+                 GError *error = NULL;
+-                char *args[5];
++                char *args[6];
+ 
+                 if (manager->priv->syndaemon_spawned)
+                         return 0;
+@@ -557,7 +557,8 @@
+                 args[1] = "-i";
+                 args[2] = "0.5";
+                 args[3] = "-k";
+-                args[4] = NULL;
++		 args[4] = "-R";
++                args[5] = NULL;
+ 
+                 if (!g_find_program_in_path (args[0]))
+                         return 0;

=== modified file 'debian/patches/series'
--- debian/patches/series	2011-03-29 14:09:03 +0000
+++ debian/patches/series	2011-04-07 11:03:24 +0000
@@ -3,6 +3,7 @@
 02_missing_libs.patch
 03_maintainer_mode.patch
 05_disable_corner_tapping.patch
+05_use_xrecord.patch
 06_use_application_indicator.patch
 07_dont_display_autostart.patch
 12_monitor_network_fs.patch