Merge lp://staging/~timchen119/gnome-control-center/gnome-control-center.precise.lp1244065 into lp://staging/ubuntu/precise-proposed/gnome-control-center
| Status: | Superseded | ||||
|---|---|---|---|---|---|
| Proposed branch: | lp://staging/~timchen119/gnome-control-center/gnome-control-center.precise.lp1244065 | ||||
| Merge into: | lp://staging/ubuntu/precise-proposed/gnome-control-center | ||||
| Diff against target: |
35441 lines (+35090/-0) (has conflicts) 69 files modified
.bzr-builddeb/default.conf (+3/-0) debian/changelog (+2928/-0) debian/compat (+1/-0) debian/control (+145/-0) debian/control.in (+141/-0) debian/copyright (+26/-0) debian/gnome-control-center-data.install (+10/-0) debian/gnome-control-center-dev.install (+1/-0) debian/gnome-control-center.install (+3/-0) debian/gnome-control-center.links (+1/-0) debian/gnome-control-center.menu (+4/-0) debian/gnome-control-center.postinst (+7/-0) debian/gnome-control-center.sgml (+313/-0) debian/gnome-control-center.xpm (+361/-0) debian/libgnome-control-center-dev.install (+3/-0) debian/libgnome-control-center1.install (+1/-0) debian/libgnome-control-center1.symbols (+23/-0) debian/patches/02_no_assert_on_null_streams.patch (+17/-0) debian/patches/04_new_appearance_settings.patch (+1908/-0) debian/patches/05_run_update_manager.patch (+13/-0) debian/patches/06_handle_passwd_with_ldap.patch (+19/-0) debian/patches/10_keyboard_layout_on_unity.patch (+69/-0) debian/patches/11_power-configure_lid_action.patch (+156/-0) debian/patches/12_add_never_turn_screen_off.patch (+29/-0) debian/patches/50_ubuntu_systemwide_prefs.patch (+194/-0) debian/patches/51_ubuntu_system_keyboard.patch (+201/-0) debian/patches/51_unity_options_in_display_panel.patch (+645/-0) debian/patches/52_ubuntu_language_list_mods.patch (+153/-0) debian/patches/53_use_ubuntu_help.patch (+38/-0) debian/patches/54_enable_alt_tap_in_shortcut.patch (+65/-0) debian/patches/55_user_accounts_hide_controls.patch (+154/-0) debian/patches/56_use_ubuntu_info_branding.patch (+26/-0) debian/patches/57_use_nonsymbolic_keyboard_icon.patch (+13/-0) debian/patches/58_ubuntu_icon_views_redesign.patch (+364/-0) debian/patches/59_install_gcm_components_on_demand.patch (+231/-0) debian/patches/60_ubuntu_nav_bar.patch (+394/-0) debian/patches/61_workaround_online_account.patch (+43/-0) debian/patches/62_update_translations_template.patch (+23/-0) debian/patches/63_normal_scrollbar_in_a11y.patch (+25/-0) debian/patches/90_force_fallback.patch (+22/-0) debian/patches/96_sound_nua_panel.patch (+16902/-0) debian/patches/97_unity_power_ui.patch (+127/-0) debian/patches/98_default_sound_theme.patch (+16/-0) debian/patches/99_add_lock-on-suspend.patch (+68/-0) debian/patches/Brightness-fix-for-gnome-settings-daemon-changes.patch (+86/-0) debian/patches/accounts_fix_unsetting_icon.patch (+13/-0) debian/patches/classic_use_sound_indicator.patch (+9/-0) debian/patches/deal_with_null_ssid.patch (+33/-0) debian/patches/dont_download_local_image.patch (+30/-0) debian/patches/fix-crash-on-user-panel.patch (+27/-0) debian/patches/git_no_preferred_mode_in_clone.patch (+30/-0) debian/patches/git_unmute_sound_event.patch (+41/-0) debian/patches/git_update_keyring_password.patch (+53/-0) debian/patches/git_wacom_translations.patch (+44/-0) debian/patches/more-power-suspend-options.patch (+32/-0) debian/patches/new_translations_hack.patch (+18/-0) debian/patches/remove-manual-proxy-in-auto.patch (+12/-0) debian/patches/revert_git_datetime_port.patch (+4633/-0) debian/patches/revert_git_drop_library.patch (+166/-0) debian/patches/revert_git_keyboard_gsettings.patch (+898/-0) debian/patches/revert_git_stop_using_gconf.patch (+13/-0) debian/patches/revert_ua_gsettings.patch (+2291/-0) debian/patches/series (+45/-0) debian/patches/use_rfkill_airplane_mode.patch (+659/-0) debian/rules (+38/-0) debian/source/format (+1/-0) debian/source/include-binaries (+1/-0) debian/source_gnome-control-center.py (+29/-0) debian/watch (+2/-0) Conflict adding file debian. Moved existing file to debian.moved. |
||||
| To merge this branch: | bzr merge lp://staging/~timchen119/gnome-control-center/gnome-control-center.precise.lp1244065 | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Sebastien Bacher | Needs Fixing | ||
|
Review via email:
|
|||
This proposal has been superseded by a proposal from 2013-10-30.
Description of the change
* 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)
| Sebastien Bacher (seb128) wrote | # |
Unmerged revisions
- 475. By Tim Chen
-
* 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) - 474. By Iain Lane
-
releasing package gnome-control-
center version 1:3.4.2-0ubuntu0.13 - 473. By Iain Lane
-
releasing package gnome-control-
center version 1:3.4.2-0ubuntu0.12 - 472. By Sebastien Bacher
-
releasing version 1:3.4.2-0ubuntu0.11
- 471. By Sebastien Bacher
-
releasing version 1:3.4.2-0ubuntu0.10
- 470. By Sebastien Bacher
-
releasing version 1:3.4.2-0ubuntu0.9
- 469. By Sebastien Bacher
-
releasing version 1:3.4.2-0ubuntu0.8
- 468. By Sebastien Bacher
-
* Backported change from Jeremy Bicha in 1:3.6.3-0ubuntu1:
debian/patches/ 52_ubuntu_ language_ list_mods. patch:
- Don't disable adding current language to the list. While this
fix shows the current language twice, at least it avoids the
"Ubuntu suddenly in Chinese" bug (LP: #1035219) - 467. By Sebastien Bacher
-
releasing version 1:3.4.2-0ubuntu0.7
- 466. By Sebastien Bacher
-
* debian/
patches/ git_unmute_ sound_event. patch:
- use the patch for sound-nua and Unity sessions as well (lp: #986692)
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:/
- could you ask the SRU team (https:/
- 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