Merge lp:~timchen119/gnome-control-center/gnome-control-center.precise.lp1244065 into lp:~ubuntu-desktop/gnome-control-center/precise

Proposed by Tim Chen on 2013-10-30
Status: Merged
Merged at revision: 475
Proposed branch: lp:~timchen119/gnome-control-center/gnome-control-center.precise.lp1244065
Merge into: lp:~ubuntu-desktop/gnome-control-center/precise
Diff against target: 61 lines (+41/-0)
3 files modified
debian/changelog (+8/-0)
debian/patches/more-power-suspend-options.patch (+32/-0)
debian/patches/series (+1/-0)
To merge this branch: bzr merge lp:~timchen119/gnome-control-center/gnome-control-center.precise.lp1244065
Reviewer Review Type Date Requested Status
Sebastien Bacher 2013-10-30 Approve on 2013-11-01
Review via email: mp+193183@code.launchpad.net

This proposal supersedes a proposal from 2013-10-24.

Description of the change

* Add additional options to the power option system sleep settings menu.
   Add 20 minutes and 2 hours options to give the user more fine-grained
   controls. (LP: #1244065)

To post a comment you must log in.
Sebastien Bacher (seb128) wrote : Posted in a previous version of this proposal

Thank you for the work there, some notes about your work:

- could you edit the patch to add the info you added to the trunk version (bug reference, description, etc)

- the bug report needs SRU impact/test case/regression potential (see https://wiki.ubuntu.com/StableReleaseUpdates for details)

- could you ask the SRU team (https://launchpad.net/~ubuntu-sru/+members#active) if that's fine to add those options in a stable update?

- you are targetting the wrong vcs, lp:~ubuntu-desktop/gnome-control-center/precise is the packaging branch for the LTS

Otherwise the changes look fine for an upload

review: Needs Fixing
Sebastien Bacher (seb128) wrote : Posted in a previous version of this proposal

oh, also having a changelog entry would be useful

Tim Chen (timchen119) wrote :

@Seb

Thanks the help and I've modified the patch and resubmit the proposal, please help to review it and I'll ask SRU team about this too. Thanks a lot for the great support.

Sebastien Bacher (seb128) wrote :

The patch looks good, I'm going to merge/upload it once the SRU team acks that the change is ok for a SRU

review: Approve
Sebastien Bacher (seb128) wrote :

did you ask the SRU team about that one?

Sebastien Bacher (seb128) wrote :

Thanks, I've merged and uploaded so get that moving, the SRU team needs to be convinced next

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 2013-10-30 00:01:55 +0000
3+++ debian/changelog 2013-10-30 03:53:28 +0000
4@@ -1,3 +1,11 @@
5+gnome-control-center (1:3.4.2-0ubuntu0.14) precise; urgency=low
6+
7+ * Add 20 minutes and 2 hours options for the suspend time in system
8+ power settings menu to give the user more fine-grained controls.
9+ (LP: #1244065)
10+
11+ -- Jian-Ding Chen (timchen119) <tim.chen119@canonical.com> Wed, 30 Oct 2013 11:33:55 +0800
12+
13 gnome-control-center (1:3.4.2-0ubuntu0.13) precise; urgency=low
14
15 * Fix disposal of killswitches hash table in previous patch. Resolves a
16
17=== added file 'debian/patches/more-power-suspend-options.patch'
18--- debian/patches/more-power-suspend-options.patch 1970-01-01 00:00:00 +0000
19+++ debian/patches/more-power-suspend-options.patch 2013-10-30 03:53:28 +0000
20@@ -0,0 +1,32 @@
21+Description: Add 20 minutes and 2 hours options to give the user
22+ more fine-grained controls.
23+Author: Jian-Ding Chen (timchen119) <tim.chen119@canonical.com>
24+Last-Update: 2013-10-30
25+Bug-Ubuntu: https:/launchpad.net/bugs/1244065
26+
27+Index: gnome-control-center/panels/power/power.ui
28+===================================================================
29+--- gnome-control-center.orig/panels/power/power.ui 2013-09-27 14:24:32.016344000 +0800
30++++ gnome-control-center/panels/power/power.ui 2013-09-27 14:25:04.799258891 +0800
31+@@ -40,6 +40,10 @@
32+ <col id="1">600</col>
33+ </row>
34+ <row>
35++ <col id="0" translatable="yes">20 minutes</col>
36++ <col id="1">1200</col>
37++ </row>
38++ <row>
39+ <col id="0" translatable="yes">30 minutes</col>
40+ <col id="1">1800</col>
41+ </row>
42+@@ -48,6 +52,10 @@
43+ <col id="1">3600</col>
44+ </row>
45+ <row>
46++ <col id="0" translatable="yes">2 hours</col>
47++ <col id="1">7200</col>
48++ </row>
49++ <row>
50+ <col id="0" translatable="yes">Don't suspend</col>
51+ <col id="1">0</col>
52+ </row>
53
54=== modified file 'debian/patches/series'
55--- debian/patches/series 2013-10-30 00:01:17 +0000
56+++ debian/patches/series 2013-10-30 03:53:28 +0000
57@@ -42,3 +42,4 @@
58 git_update_keyring_password.patch
59 remove-manual-proxy-in-auto.patch
60 use_rfkill_airplane_mode.patch
61+more-power-suspend-options.patch

Subscribers

People subscribed via source and target branches

to all changes: