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

Proposed by Tim Chen
Status: Merged
Merged at revision: 617
Proposed branch: lp:~timchen119/gnome-control-center/gnome-control-center.lp1244065
Merge into: lp:~ubuntu-desktop/gnome-control-center/ubuntu
Diff against target: 70 lines (+41/-1)
3 files modified
debian/changelog (+8/-1)
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.lp1244065
Reviewer Review Type Date Requested Status
Sebastien Bacher Approve
Iain Lane Needs Fixing
Review via email: mp+192470@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Iain Lane (laney) wrote :

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

Revision history for this message
Tim Chen (timchen119) wrote :

@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!

Revision history for this message
Iain Lane (laney) wrote :

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.

Revision history for this message
Iain Lane (laney) wrote :

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

619. By Tim Chen on 2013-10-24

* Fix patch to meet the patch convention of DEP3.

Revision history for this message
Tim Chen (timchen119) wrote :

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

Revision history for this message
Sebastien Bacher (seb128) wrote :

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

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 2013-10-23 17:02:34 +0000
3+++ debian/changelog 2013-10-24 09:30:58 +0000
4@@ -1,12 +1,19 @@
5 gnome-control-center (1:3.6.3-0ubuntu46) UNRELEASED; urgency=low
6
7+ [ Iain Lane ]
8 * 0001-rfkill-glib-Don-t-use-g_assert_not_reached-in-type_t.patch:
9 Cherry-pick 90f49a4d5dd646b8fce10f61a9231db4973a907b from upstream.
10 rfkill-glib: Don't use g_assert_not_reached in type_to_string. New kernel
11 versions can add new RFKILL types, we should not crash here, just say that
12 we don't know what the switch is. (LP: #1209092)
13
14- -- Iain Lane <iain.lane@canonical.com> Wed, 23 Oct 2013 17:56:10 +0100
15+ [ Jian-Ding Chen (timchen119) ]
16+ * Some Canonical OEM partners have requested additional options
17+ be added to the power option system sleep settings menu.
18+ Add 20 minutes and 2 hours options to give the user more
19+ fine-grained controls. (LP: #1244065)
20+
21+ -- Jian-Ding Chen (timchen119) <tim.chen119@canonical.com> Thu, 24 Oct 2013 16:58:08 +0800
22
23 gnome-control-center (1:3.6.3-0ubuntu45) saucy; urgency=low
24
25
26=== added file 'debian/patches/more-power-suspend-options.patch'
27--- debian/patches/more-power-suspend-options.patch 1970-01-01 00:00:00 +0000
28+++ debian/patches/more-power-suspend-options.patch 2013-10-24 09:30:58 +0000
29@@ -0,0 +1,32 @@
30+Description: Add 20 minutes and 2 hours options to give the user
31+ more fine-grained controls.
32+Author: Jian-Ding Chen (timchen119) <tim.chen119@canonical.com>
33+Last-Update: 2013-10-24
34+Bug-Ubuntu: https:/launchpad.net/bugs/1244065
35+
36+Index: gnome-control-center/panels/power/power.ui
37+===================================================================
38+--- gnome-control-center.orig/panels/power/power.ui 2013-09-27 14:24:32.016344000 +0800
39++++ gnome-control-center/panels/power/power.ui 2013-09-27 14:25:04.799258891 +0800
40+@@ -40,6 +40,10 @@
41+ <col id="1">600</col>
42+ </row>
43+ <row>
44++ <col id="0" translatable="yes">20 minutes</col>
45++ <col id="1">1200</col>
46++ </row>
47++ <row>
48+ <col id="0" translatable="yes">30 minutes</col>
49+ <col id="1">1800</col>
50+ </row>
51+@@ -48,6 +52,10 @@
52+ <col id="1">3600</col>
53+ </row>
54+ <row>
55++ <col id="0" translatable="yes">2 hours</col>
56++ <col id="1">7200</col>
57++ </row>
58++ <row>
59+ <col id="0" translatable="yes">Don't suspend</col>
60+ <col id="1">0</col>
61+ </row>
62
63=== modified file 'debian/patches/series'
64--- debian/patches/series 2013-10-23 17:02:34 +0000
65+++ debian/patches/series 2013-10-24 09:30:58 +0000
66@@ -56,3 +56,4 @@
67 git_add_printer_crash.patch
68 ubuntu_update_translations_template.patch
69 unity_no_zoom_controls.patch
70+more-power-suspend-options.patch

Subscribers

People subscribed via source and target branches