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

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~ubuntu-desktop/gnome-control-center/ubuntu at revision 617

Sebastien Bacher: Approve on 2013-10-29

Iain Lane: Needs Fixing on 2013-10-24

Diff: 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)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1244065: Add more options to the power settings menu

Undecided

Fix Released

Link a bug report

Related blueprints

619. By Tim Chen on 2013-10-24

* Fix patch to meet the patch convention of DEP3.

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

617. By Tim Chen on 2013-10-24

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

616. By Iain Lane on 2013-10-23

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)

615. By Sebastien Bacher on 2013-10-21

releasing package gnome-control-center version 1:3.6.3-0ubuntu45

614. By Sebastien Bacher on 2013-10-21

[ William Hua ]
* debian/patches/input-sources-text-entry.patch:
  - support modifier-only input-source switching (lp: #1218322)

613. By Iain Lane on 2013-10-18

* debian/patches/97_unity_power_ui.patch: Don't crash if indicator-power
  isn't installed. When deciding whether to display/not display the
  indicator-power options, use the presence of indicator-power instead of
  just checking if Unity is the DE in use. (LP: #1195481)
* debian/control.in: Build-Depend on glib >= 2.31.2 for
  g_settings_schema_source_ref.

612. By Robert Ancell on 2013-10-16

releasing package gnome-control-center version 1:3.6.3-0ubuntu44

611. By Robert Ancell on 2013-10-16

* debian/patches/git_add_printer_crash.patch:
  - Fix crash when adding a printer (LP: #1155825)

610. By Sebastien Bacher on 2013-10-08

releasing package gnome-control-center version 1:3.6.3-0ubuntu43