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

Proposed by Jackson Doak on 2015-03-18
Status: Merged
Merged at revision: 486
Proposed branch: lp:~noskcaj/gnome-settings-daemon/3.14.2-3
Merge into: lp:~ubuntu-desktop/gnome-settings-daemon/ubuntu
Diff against target: 92 lines (+69/-0)
3 files modified
debian/changelog (+40/-0)
debian/patches/power-make-sure-to-set-an-error-when-GDBus-set_prope.patch (+28/-0)
debian/patches/series (+1/-0)
To merge this branch: bzr merge lp:~noskcaj/gnome-settings-daemon/3.14.2-3
Reviewer Review Type Date Requested Status
Ubuntu Desktop 2015-03-18 Pending
Review via email: mp+253438@code.launchpad.net

Description of the change

Merge a bugfix from debian

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2015-01-29 06:01:20 +0000
3+++ debian/changelog 2015-03-18 20:52:49 +0000
4@@ -1,3 +1,43 @@
5+gnome-settings-daemon (3.14.2-3ubuntu1) vivid; urgency=low
6+
7+ * Merge with Debian, remaining changes:
8+ + Split out schemas into gnome-settings-daemon-schemas so
9+ unity-settings-daemon can use them
10+ + debian/patches:
11+ - 05_disable_corner_tapping.patch:
12+ Disable corner tapping when disabling tap to click
13+ - 43_disable_locale_settings.patch:
14+ Don't set locales after sourcing .profile
15+ - 45_suppress-printer-may-not-be-connected-notification.patch
16+ - 53_sync_input_sources_to_accountsservice.patch
17+ - 64_restore_terminal_keyboard_shortcut_schema.patch
18+ - correct_logout_action.patch
19+ display the logout action on ctrl-alt-del (lp: #961501)
20+ - migrate_metacity_keys.patch
21+ Migrate screenshot/terminal keys from metacity gconf as well
22+ (LP: #1058004)
23+ - nexus-orientation.patch
24+ Fix screen rotation on nexus7
25+ - ubuntu-lid-close-suspend.patch
26+ Reimplement support for setting lid close suspend actions
27+ - revert_background_dropping.patch
28+ Keep gsettings keys background u-s-d needs them
29+ - revert-gsettings-removals.patch
30+ Revert gsettings keys that were dropped since 3.8, for u-s-d
31+ + debian/gnome-settings-daemon.install: Install apport hook
32+ + debian/rules: install upstart scripts
33+
34+ -- Jackson Doak <noskcaj@ubuntu.com> Thu, 19 Mar 2015 07:37:45 +1100
35+
36+gnome-settings-daemon (3.14.2-3) unstable; urgency=medium
37+
38+ * Team upload
39+ * power-make-sure-to-set-an-error-when-GDBus-set_prope.patch:
40+ set the error when a GDBus set_property callback fails
41+ (hopefully Closes: #775877)
42+
43+ -- Simon McVittie <smcv@debian.org> Mon, 09 Mar 2015 09:49:20 +0000
44+
45 gnome-settings-daemon (3.14.2-2ubuntu2) vivid; urgency=medium
46
47 * Turn new sharing plugin on now we have network-manager 0.9.10
48
49=== added file 'debian/patches/power-make-sure-to-set-an-error-when-GDBus-set_prope.patch'
50--- debian/patches/power-make-sure-to-set-an-error-when-GDBus-set_prope.patch 1970-01-01 00:00:00 +0000
51+++ debian/patches/power-make-sure-to-set-an-error-when-GDBus-set_prope.patch 2015-03-18 20:52:49 +0000
52@@ -0,0 +1,28 @@
53+From: Simon McVittie <simon.mcvittie@collabora.co.uk>
54+Date: Mon, 9 Mar 2015 09:48:16 +0000
55+Subject: power: make sure to set an error when GDBus set_property fails
56+
57+If we return FALSE, the API is that the error must be set, and
58+GDBus asserts this.
59+
60+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=745920
61+Bug-Debian: https://bugs.debian.org/775877
62+Reviewed-by: Bastien Nocera
63+Applied-upstream: 3.15.92, commit:4e8448a; 3.14.3, commit:d91542c
64+---
65+ plugins/power/gsd-power-manager.c | 2 ++
66+ 1 file changed, 2 insertions(+)
67+
68+diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c
69+index b31ec6d..eafa082 100644
70+--- a/plugins/power/gsd-power-manager.c
71++++ b/plugins/power/gsd-power-manager.c
72+@@ -2771,6 +2771,8 @@ handle_set_property (GDBusConnection *connection,
73+ /* Check session pointer as a proxy for whether the manager is in the
74+ start or stop state */
75+ if (manager->priv->session == NULL) {
76++ g_set_error (error, G_DBUS_ERROR, G_DBUS_ERROR_FAILED,
77++ "Manager is starting or stopping");
78+ return FALSE;
79+ }
80+
81
82=== modified file 'debian/patches/series'
83--- debian/patches/series 2014-12-20 20:23:02 +0000
84+++ debian/patches/series 2015-03-18 20:52:49 +0000
85@@ -1,6 +1,7 @@
86 01_reinstate_updates_plugin.patch
87 04_superP.patch
88 30_xrandr_dbus_init.patch
89+power-make-sure-to-set-an-error-when-GDBus-set_prope.patch
90 05_disable_corner_tapping.patch
91 43_disable_locale_settings.patch
92 45_suppress-printer-may-not-be-connected-notification.patch

Subscribers

People subscribed via source and target branches

to all changes: