Merge lp:~jlangvand/ubuntu/quantal/gnome-control-center/fix-for-993440 into lp:ubuntu/quantal/gnome-control-center

[Joakim Langvand]

Add "Suspend" as an optional action for critical battery level.

[Didier Roche (didrocks)]

Hey Joakim!

Thanks for you patch and help to make ubuntu better :)
We try to not add strings to existing ubuntu release, because they won't be translated. Also, this change the behavior by introducing more options to people on an existing release and the SRU policy is to avoid doing that.

I think this patch may be discussed (can you take it upstream as well?) and should be rebase on raring, which will probably use gnome-control-center 4.6. Do you mind proposing it against lp:~ubuntu-desktop/gnome-control-center/ubuntu? (This is where desktop packaging are handled, see Bzr-Vcs in debian/control pointing to it).

Thanks agian, will reject the branch for now.

review: Resubmit

Unmerged revisions

271. By Joakim Langvand on 2012-11-08

* debian/patches/power_suspend_on_critical.patch:
  - added suspend as an option for critical battery level (lp: #993440)

=== modified file 'debian/changelog'
--- debian/changelog	2012-10-09 17:03:35 +0000
+++ debian/changelog	2012-11-08 21:53:18 +0000
@@ -1,3 +1,10 @@
+gnome-control-center (1:3.4.2-0ubuntu20) UNRELEASED; urgency=low
+
+  * debian/patches/power_suspend_on_critical.patch:
+    - added suspend as an option for critical battery level (lp: #993440)
+
+ -- Joakim Langvand <[e-mail]>  Thu, 08 Nov 2012 22:38:11 +0100
+
 gnome-control-center (1:3.4.2-0ubuntu19) quantal; urgency=low
 
   * debian/patches/clutter_init.patch:

=== added file 'debian/patches/power_suspend_on_critical.patch'
--- debian/patches/power_suspend_on_critical.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/power_suspend_on_critical.patch	2012-11-08 21:53:18 +0000
@@ -0,0 +1,19 @@
+## Description: add some description
+## Origin/Author: add some origin or author
+## Bug: bug URL
+Index: gnome-control-center.dev/panels/power/power.ui
+===================================================================
+--- gnome-control-center.dev.orig/panels/power/power.ui	2012-11-08 22:26:58.463011000 +0100
++++ gnome-control-center.dev/panels/power/power.ui	2012-11-08 22:38:03.075415394 +0100
+@@ -12,6 +12,11 @@
+     </columns>
+     <data>
+       <row>
++        <col id="0" translatable="yes">Suspend</col>
++        <col id="1">1</col>
++        <col id="2">True</col>
++      </row>
++      <row>
+         <col id="0" translatable="yes">Hibernate</col>
+         <col id="1">3</col>
+         <col id="2">True</col>

=== modified file 'debian/patches/series'
--- debian/patches/series	2012-10-09 17:03:35 +0000
+++ debian/patches/series	2012-11-08 21:53:18 +0000
@@ -45,3 +45,4 @@
 power_cancellable_fixes.patch
 git_fix_big_editable_labels.patch
 git_unmute_sound_event.patch
+power_suspend_on_critical.patch