lp:~darkxst/ubuntu/utopic/gnome-control-center/lp1372346
- Get this branch:
- bzr branch lp:~darkxst/ubuntu/utopic/gnome-control-center/lp1372346
Branch merges
- Martin Pitt: Approve
-
Diff: 5698 lines (+3404/-1523)32 files modifieddebian/changelog (+392/-0)
debian/control (+45/-44)
debian/control.in (+44/-43)
debian/gnome-control-center-data.maintscript (+2/-0)
debian/gnome-control-center-data.postinst (+8/-0)
debian/gnome-control-center.install (+6/-1)
debian/gnome-control-center.pkla (+2/-2)
debian/gnome-control-center.postinst (+7/-0)
debian/gnome-control-center.postrm (+12/-0)
debian/patches/01_menu_category.patch (+13/-0)
debian/patches/02_new_goa.patch (+0/-46)
debian/patches/06_handle_passwd_with_ldap.patch (+19/-0)
debian/patches/07_polkit_wheel_sudo_group.patch (+16/-0)
debian/patches/52_region_language.patch (+40/-40)
debian/patches/99_add_lock-on-suspend.patch (+2/-9)
debian/patches/gcc_not_in_unity.patch (+0/-154)
debian/patches/git-background-lock-screen.patch (+0/-862)
debian/patches/git-background-remove-unused-widget.patch (+0/-111)
debian/patches/git-online-accounts-chat-providers.patch (+0/-51)
debian/patches/git_fix_libbackground_linking.patch (+0/-24)
debian/patches/git_iconview_columns.patch (+0/-16)
debian/patches/git_rename_natural_scrolling.patch (+0/-26)
debian/patches/power-panel-3.10.patch (+979/-0)
debian/patches/revert-bluetooth-BlueZ5-interface.patch (+34/-0)
debian/patches/revert_git_dont_hide_zoom.patch (+23/-25)
debian/patches/revert_git_drop_library.patch (+10/-11)
debian/patches/revert_git_new_bluetooth_panel.patch (+1607/-0)
debian/patches/revert_new_bluetooth.patch (+68/-0)
debian/patches/series (+7/-8)
debian/patches/ubuntu-gnome-version.patch (+14/-8)
debian/patches/ubuntu_external_panels.patch (+53/-41)
debian/watch (+1/-1)
Related bugs
Bug #1372346: [FFe] gnome-desktop 3.12 transition | Undecided | Fix Released |
Related blueprints
Branch information
- Owner:
- Tim Lunn
- Status:
- Development
Recent revisions
- 648. By Tim Lunn
-
Drop gcc_not_
in_unity. patch, this is no longer needed since all panels now
set NoDisplay=true in their desktop files - 647. By Tim Lunn
-
* New Upstream Release (LP: #1372346)
* Merge with Debian, remaining changes:
+ debian/patches:
- revert_git_new_ bluetooth_ panel.patch,
revert_new_bluetooth. patch,
revert-bluetooth- BlueZ5- interface. patch:
Revert bluetooth back to Bluez4
- 52_region_language. patch
Adapt region panel to use Ubuntu style regions and UTF-8
- 56_use_ubuntu_ info_branding. patch,
ubuntu-gnome-version. patch
Use Ubuntu GNOME branding
- 64_restore_terminal_ keyboard_ shortcut. patch
Bring back terminal shortcut
- 92_ubuntu_system_ proxy.patch
Add system proxy support
- 99_add_lock-on- suspend. patch
Add option to lock on suspend
- revert_git_dont_ hide_zoom. patch
Bring back zoom settings
- revert_git_drop_ library. patch,
ubuntu_external_ panels. patch
Reimplement support for external panels
- gcc_not_in_unity. patch
don't list "Unity" in OnlyShowIn
+ debian/control.in:
- Relax build-deps on upower and gnome-bluetooth
- Drop Recommends for packages not in main
- Various other Ubuntu specific changes
+ debian/libgnome- control- center1. symbols:
- Add new symbols from external panel patch
+ debian/gnome-control- center- data.install:
- don't install the pkla yet
+ Split out shared data that is used by unity-control-center
+ Add a wrapper to run unity-control-center in Unity
+ Install apport hook
+ Revert to 3.10 power panel, until we have new upower - 643. By Daniel Holbach
-
debian/
patches/ git-online- accounts- chat-providers. patch:
Handle Chat providers that were added in GOA 3.10 (LP: #1323442) - 640. By Martin Pitt
-
* debian/
patches/ ubuntu- gnome-version. patch: Merge build-time versioned
logo from unity-control-center (LP: #1299912)
* debian/rules: generate logo
* debian/control.in: build-depend on ubuntu font and valac, also add
build-dep on libkrb5-dev to fix FTBS on utopic
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:ubuntu/utopic/gnome-control-center