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

[Tim Chen]

* 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)

[Sebastien Bacher (seb128)]

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)]

oh, also having a changelog entry would be useful

[Tim Chen (timchen119)]

@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)]

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)]

did you ask the SRU team about that one?

[Sebastien Bacher (seb128)]

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

=== modified file 'debian/changelog'
--- debian/changelog	2013-10-30 00:01:55 +0000
+++ debian/changelog	2013-10-30 03:53:28 +0000
@@ -1,3 +1,11 @@
+gnome-control-center (1:3.4.2-0ubuntu0.14) precise; urgency=low
+
+  * Add 20 minutes and 2 hours options for the suspend time in system
+    power settings menu to give the user more fine-grained controls.
+    (LP: #1244065)
+
+ -- Jian-Ding Chen (timchen119) <[e-mail]>  Wed, 30 Oct 2013 11:33:55 +0800
+
 gnome-control-center (1:3.4.2-0ubuntu0.13) precise; urgency=low
 
   * Fix disposal of killswitches hash table in previous patch. Resolves a

=== added file 'debian/patches/more-power-suspend-options.patch'
--- debian/patches/more-power-suspend-options.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/more-power-suspend-options.patch	2013-10-30 03:53:28 +0000
@@ -0,0 +1,32 @@
+Description: Add 20 minutes and 2 hours options to give the user
+ more fine-grained controls.
+Author: Jian-Ding Chen (timchen119) <[e-mail]>
+Last-Update: 2013-10-30
+Bug-Ubuntu: https:/launchpad.net/bugs/1244065
+
+Index: gnome-control-center/panels/power/power.ui
+===================================================================
+--- gnome-control-center.orig/panels/power/power.ui	2013-09-27 14:24:32.016344000 +0800
++++ gnome-control-center/panels/power/power.ui	2013-09-27 14:25:04.799258891 +0800
+@@ -40,6 +40,10 @@
+         <col id="1">600</col>
+       </row>
+       <row>
++        <col id="0" translatable="yes">20 minutes</col>
++        <col id="1">1200</col>
++      </row>
++      <row>
+         <col id="0" translatable="yes">30 minutes</col>
+         <col id="1">1800</col>
+       </row>
+@@ -48,6 +52,10 @@
+         <col id="1">3600</col>
+       </row>
+       <row>
++        <col id="0" translatable="yes">2 hours</col>
++        <col id="1">7200</col>
++      </row>
++      <row>
+         <col id="0" translatable="yes">Don't suspend</col>
+         <col id="1">0</col>
+       </row>

=== modified file 'debian/patches/series'
--- debian/patches/series	2013-10-30 00:01:17 +0000
+++ debian/patches/series	2013-10-30 03:53:28 +0000
@@ -42,3 +42,4 @@
 git_update_keyring_password.patch
 remove-manual-proxy-in-auto.patch
 use_rfkill_airplane_mode.patch
+more-power-suspend-options.patch