Merge lp:~jbicha/ubuntu/oneiric/gnome-settings-daemon/add-suspend-overrides into lp:~ubuntu-desktop/gnome-settings-daemon/ubuntu

Proposed by Jeremy Bícha
Status: Merged
Merged at revision: 171
Proposed branch: lp:~jbicha/ubuntu/oneiric/gnome-settings-daemon/add-suspend-overrides
Merge into: lp:~ubuntu-desktop/gnome-settings-daemon/ubuntu
Diff against target: 27 lines (+12/-0)
2 files modified
debian/changelog (+9/-0)
debian/gnome-settings-daemon.gsettings-override (+3/-0)
To merge this branch: bzr merge lp:~jbicha/ubuntu/oneiric/gnome-settings-daemon/add-suspend-overrides
Reviewer Review Type Date Requested Status
Martin Pitt Approve
Review via email: mp+68166@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Martin Pitt (pitti) wrote :

That looks good, thanks! I also updated the upstream bug.

review: Approve

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 2011-07-13 09:50:37 +0000
3+++ debian/changelog 2011-07-17 01:46:03 +0000
4@@ -1,3 +1,12 @@
5+gnome-settings-daemon (3.1.3-0ubuntu6) oneiric; urgency=low
6+
7+ * debian/gnome-settings-daemon.gsettings-override:
8+ - Turn on autosleep on battery for Energy Star 5.0 compliance (LP: #604635)
9+ - Suspend by default when system sleep button is pressed
10+ - Suspend by default for low battery as hibernate can be slow & unreliable
11+
12+ -- Jeremy Bicha <jbicha@ubuntu.com> Sat, 16 Jul 2011 21:27:12 -0400
13+
14 gnome-settings-daemon (3.1.3-0ubuntu5) oneiric; urgency=low
15
16 * debian/patches/01_git_shorter_syndaemon_delay.patch:
17
18=== modified file 'debian/gnome-settings-daemon.gsettings-override'
19--- debian/gnome-settings-daemon.gsettings-override 2011-07-11 10:16:07 +0000
20+++ debian/gnome-settings-daemon.gsettings-override 2011-07-17 01:46:03 +0000
21@@ -8,3 +8,6 @@
22
23 [org.gnome.settings-daemon.plugins.power]
24 button-power = 'interactive'
25+button-sleep = 'suspend'
26+critical-battery-action = 'suspend'
27+sleep-inactive-battery = true

Subscribers

People subscribed via source and target branches

to all changes: