Merge lp:~noskcaj/gnome-settings-daemon/3.14.2-3 into lp:~ubuntu-desktop/gnome-settings-daemon/ubuntu

[Jackson Doak]

Merge a bugfix from debian

=== modified file 'debian/changelog'
--- debian/changelog	2015-01-29 06:01:20 +0000
+++ debian/changelog	2015-03-18 20:52:49 +0000
@@ -1,3 +1,43 @@
+gnome-settings-daemon (3.14.2-3ubuntu1) vivid; urgency=low
+
+  * Merge with Debian, remaining changes:
+    + Split out schemas into gnome-settings-daemon-schemas so 
+      unity-settings-daemon can use them 
+    + debian/patches:
+       - 05_disable_corner_tapping.patch:
+          Disable corner tapping when disabling tap to click
+       - 43_disable_locale_settings.patch:
+          Don't set locales after sourcing .profile
+       - 45_suppress-printer-may-not-be-connected-notification.patch
+       - 53_sync_input_sources_to_accountsservice.patch
+       - 64_restore_terminal_keyboard_shortcut_schema.patch
+       - correct_logout_action.patch
+          display the logout action on ctrl-alt-del (lp: #961501)
+       - migrate_metacity_keys.patch
+          Migrate screenshot/terminal keys from metacity gconf as well
+          (LP: #1058004)
+       - nexus-orientation.patch
+          Fix screen rotation on nexus7
+       - ubuntu-lid-close-suspend.patch
+          Reimplement support for setting lid close suspend actions
+       - revert_background_dropping.patch
+          Keep gsettings keys background u-s-d needs them
+       - revert-gsettings-removals.patch
+          Revert gsettings keys that were dropped since 3.8, for u-s-d
+    + debian/gnome-settings-daemon.install: Install apport hook
+    + debian/rules: install upstart scripts
+
+ -- Jackson Doak <[e-mail]>  Thu, 19 Mar 2015 07:37:45 +1100
+
+gnome-settings-daemon (3.14.2-3) unstable; urgency=medium
+
+  * Team upload
+  * power-make-sure-to-set-an-error-when-GDBus-set_prope.patch:
+    set the error when a GDBus set_property callback fails
+    (hopefully Closes: #775877)
+
+ -- Simon McVittie <[e-mail]>  Mon, 09 Mar 2015 09:49:20 +0000
+
 gnome-settings-daemon (3.14.2-2ubuntu2) vivid; urgency=medium
 
   * Turn new sharing plugin on now we have network-manager 0.9.10
 
=== added file 'debian/patches/power-make-sure-to-set-an-error-when-GDBus-set_prope.patch'
--- debian/patches/power-make-sure-to-set-an-error-when-GDBus-set_prope.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/power-make-sure-to-set-an-error-when-GDBus-set_prope.patch	2015-03-18 20:52:49 +0000
@@ -0,0 +1,28 @@
+From: Simon McVittie <[e-mail]>
+Date: Mon, 9 Mar 2015 09:48:16 +0000
+Subject: power: make sure to set an error when GDBus set_property fails
+
+If we return FALSE, the API is that the error must be set, and
+GDBus asserts this.
+
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=745920
+Bug-Debian: https://bugs.debian.org/775877
+Reviewed-by: Bastien Nocera
+Applied-upstream: 3.15.92, commit:4e8448a; 3.14.3, commit:d91542c
+---
+ plugins/power/gsd-power-manager.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c
+index b31ec6d..eafa082 100644
+--- a/plugins/power/gsd-power-manager.c
++++ b/plugins/power/gsd-power-manager.c
+@@ -2771,6 +2771,8 @@ handle_set_property (GDBusConnection *connection,
+         /* Check session pointer as a proxy for whether the manager is in the
+            start or stop state */
+         if (manager->priv->session == NULL) {
++                g_set_error (error, G_DBUS_ERROR, G_DBUS_ERROR_FAILED,
++                             "Manager is starting or stopping");
+                 return FALSE;
+         }
+ 
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2014-12-20 20:23:02 +0000
+++ debian/patches/series	2015-03-18 20:52:49 +0000
@@ -1,6 +1,7 @@
 01_reinstate_updates_plugin.patch
 04_superP.patch
 30_xrandr_dbus_init.patch
+power-make-sure-to-set-an-error-when-GDBus-set_prope.patch
 05_disable_corner_tapping.patch
 43_disable_locale_settings.patch
 45_suppress-printer-may-not-be-connected-notification.patch