Created by Tim Lunn on 2014-09-24 and last modified on 2014-09-30
Get this branch:
bzr branch lp:~darkxst/ubuntu/utopic/gnome-control-center/lp1372346
Only Tim Lunn can upload to this branch. If you are Tim Lunn please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

Tim Lunn

Recent revisions

648. By Tim Lunn on 2014-09-30

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 on 2014-09-23

* New Upstream Release (LP: #1372346)
* Merge with Debian, remaining changes:
  + debian/patches:
    - revert_git_new_bluetooth_panel.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,
       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,
       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

646. By Robert Ancell on 2014-08-20

Actually do a no change rebuild against new libgtop

645. By Robert Ancell on 2014-08-18

No-change rebuild against new libgtop

644. By Robert Ancell on 2014-08-18

No-change rebuild against new colord

643. By Daniel Holbach on 2014-05-27

Handle Chat providers that were added in GOA 3.10 (LP: #1323442)

641. By Martin Pitt on 2014-05-07

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

640. By Martin Pitt on 2014-05-07

* 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

639. By Sebastien Bacher on 2014-04-10

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

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
This branch contains Public information 
Everyone can see this information.