Merge lp:~darkxst/ubuntu/saucy/gnome-settings-daemon/lp1184812ud into lp:~ubuntu-desktop/gnome-settings-daemon/ubuntu

[Tim Lunn]

[Jeremy Bícha (jbicha)]

Thanks! Uploaded.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-05-17 11:26:52 +0000
+++ debian/changelog	2013-05-28 10:39:26 +0000
@@ -1,3 +1,10 @@
+gnome-settings-daemon (3.6.4-0ubuntu12) saucy; urgency=low
+
+  * Rebuild for gnome-desktop 3.8 transition (LP: 1184812)
+    - debian/patches/git_xrandr_dont_include_labeller_widget.patch
+
+ -- Tim Lunn <[e-mail]>  Tue, 28 May 2013 10:04:36 +1000
+
 gnome-settings-daemon (3.6.4-0ubuntu11) saucy; urgency=low
 
   * debian/patches/git_sound_not_polling.patch: Create directory with correct

=== added file 'debian/patches/git_xrandr_dont_include_labeller_widget.patch'
--- debian/patches/git_xrandr_dont_include_labeller_widget.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/git_xrandr_dont_include_labeller_widget.patch	2013-05-28 10:39:26 +0000
@@ -0,0 +1,21 @@
+From ec21e9a74a9091250e3161e47bafdffd355b454a Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <[e-mail]>
+Date: Wed, 21 Nov 2012 21:08:21 +0000
+Subject: xrandr: Don't include unneeded labeler widget
+
+---
+diff --git a/plugins/xrandr/gsd-xrandr-manager.c b/plugins/xrandr/gsd-xrandr-manager.c
+index 7b459c3..9cf1561 100644
+--- a/plugins/xrandr/gsd-xrandr-manager.c
++++ b/plugins/xrandr/gsd-xrandr-manager.c
+@@ -45,7 +45,6 @@
+ 
+ #include <libgnome-desktop/gnome-rr-config.h>
+ #include <libgnome-desktop/gnome-rr.h>
+-#include <libgnome-desktop/gnome-rr-labeler.h>
+ 
+ #ifdef HAVE_WACOM
+ #include <libwacom/libwacom.h>
+--
+cgit v0.9.1
+

=== modified file 'debian/patches/series'
--- debian/patches/series	2013-05-17 11:05:02 +0000
+++ debian/patches/series	2013-05-28 10:39:26 +0000
@@ -24,3 +24,4 @@
 git_glib_get_xdg_dirs.patch
 git_sound_not_polling.patch
 fix_broken_user_sounds_permissions.patch
+git_xrandr_dont_include_labeller_widget.patch