Created by Sebastien Bacher on 2009-02-20 and last modified on 2015-11-25
Get this branch:
bzr branch lp:~ubuntu-desktop/gnome-control-center/ubuntu
Members of Ubuntu Desktop can upload to this branch. Log in for directions.

Branch merges

Related bugs

Related blueprints

Branch information

Ubuntu Desktop

Recent revisions

678. By Tim on 2015-11-25

revert_online_accounts_disable_remove_button.patch: Dropped we have
g-o-a 3.18 now. Although its still using webkit1 so keep the POODLE SSL
patch for now.

677. By Sebastien Bacher on 2015-11-18

releasing package gnome-control-center version 1:3.18.2-1ubuntu2

676. By Sebastien Bacher on 2015-11-18

* debian/gnome-control-center.pkla:
  - removed, include those permissions in policykit-desktop-privileges
    instead which is a more logical place for that (lp: #1512435)
* debian/control.in:
  - drop g-c-c-shared-data, that only included the permissions listed
    before and some user-account images which are built from
    unity-control-center now, recommends that new binary instead

675. By Tim on 2015-11-14

* Merge with Debian, remaining changes see below
* Add pulseaudio-module-bluetooth to the Recommends, this is allowing the
  user to use his computer as an external speaker for devices like
* New upstream release.
* Drop 08_fix_syntax_errors_in_sharing_panel_translations.patch, merged

674. By Tim on 2015-11-07

releasing package gnome-control-center version 1:3.18.1-1ubuntu1

673. By Tim on 2015-10-28

* Merge with Debian, remaining changes: (LP: #1511140)
  + debian/patches:
    - 52_region_language.patch
      Adapt region panel to use Ubuntu style regions
    - 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
    - ubuntu_external_panels.patch
       Reimplement support for desktop launchers
    - revert_online_accounts_disable_remove_button.patch,
        revert patches that require g-o-a 3.16
  + debian/control.in:
    - Drop Recommends for packages not in main
    - Various other Ubuntu specific changes
    - build-dep on ttf-ubuntu-font-family and valac
       For logo generation
  + Split out shared data that is used by unity-control-center
  + Add a wrapper to run unity-control-center in Unity
  + Install apport hook

672. By Robert Ancell on 2015-10-07

New upstream stable release:

671. By Tim on 2015-09-15

fix paths in include-binaries

670. By Tim on 2015-09-15

* debian/git_datetime_missing_timezone.patch: Drop symlinks from patch
* debian/rules, tz-images/, include-binaries: Install the updated map images
  into build tree, backported from 3.18

669. By Tim on 2015-09-11

add the patches

Branch metadata

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