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

[Tim Chen]

[Iain Lane (laney)]

Thanks, some comments

 - Please add a changelog entry in debian/changelog (using 'dch')
 - Don't call the patch oem_... (or justify it as an "OEM request" anywhere;
   it's fine that the original request came from there but it should be
   justifiable on its own merits and that should be the reason for us to
   include it in Ubuntu)
 - Please add DEP3 headers: http://dep.debian.net/deps/dep3/

review: Needs Fixing

[lp:~timchen119/gnome-control-center/gnome-control-center.lp1244065]

618. By Tim Chen on 2013-10-24

* add a changelog entry in debian/changelog.
* rename oem-power-suspend-options.patch to more-power-suspend-options.patch
* add DEP3 header

[Tim Chen (timchen119)]

@Iain
Could you help to check if it's getting better?
Also this need to backport to precise, I'll correct the branches accordingly base on your feedback.
Thanks!

[Iain Lane (laney)]

Yes, but please get rid of "Some Canonical OEM partners ..."

I don't know if this will be SRUable - you should check with the SRU team before proceeding on that.

[Iain Lane (laney)]

Please add Bug-Ubuntu: ... to the patch.

[lp:~timchen119/gnome-control-center/gnome-control-center.lp1244065]

619. By Tim Chen on 2013-10-24

* Fix patch to meet the patch convention of DEP3.

[Tim Chen (timchen119)]

@Iain
Thanks your great support, and I've fixed the patch again.
I'll ask for SRU, thanks your information.

[Sebastien Bacher (seb128)]

Thanks, I've merged that in, it's going to be in the next package upload

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-10-23 17:02:34 +0000
+++ debian/changelog	2013-10-24 09:30:58 +0000
@@ -1,12 +1,19 @@
 gnome-control-center (1:3.6.3-0ubuntu46) UNRELEASED; urgency=low
 
+  [ Iain Lane ]
   * 0001-rfkill-glib-Don-t-use-g_assert_not_reached-in-type_t.patch:
     Cherry-pick 90f49a4d5dd646b8fce10f61a9231db4973a907b from upstream.
     rfkill-glib: Don't use g_assert_not_reached in type_to_string. New kernel
     versions can add new RFKILL types, we should not crash here, just say that
     we don't know what the switch is. (LP: #1209092)
 
- -- Iain Lane <[e-mail]>  Wed, 23 Oct 2013 17:56:10 +0100
+  [ Jian-Ding Chen (timchen119) ]
+  * Some Canonical OEM partners have requested additional options
+    be added 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)
+
+ -- Jian-Ding Chen (timchen119) <[e-mail]>  Thu, 24 Oct 2013 16:58:08 +0800
 
 gnome-control-center (1:3.6.3-0ubuntu45) saucy; urgency=low
 

=== 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-24 09:30:58 +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-24
+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-23 17:02:34 +0000
+++ debian/patches/series	2013-10-24 09:30:58 +0000
@@ -56,3 +56,4 @@
 git_add_printer_crash.patch
 ubuntu_update_translations_template.patch
 unity_no_zoom_controls.patch
+more-power-suspend-options.patch