Created by Ubuntu Package Importer on 2014-05-07 and last modified on 2014-05-09
Get this branch:
bzr branch lp:ubuntu/utopic-proposed/gnome-control-center
Members of Ubuntu branches can upload to this branch. Log in for directions.

Branch merges

Related bugs

Related blueprints

Branch information

Ubuntu branches
Review team:
Ubuntu Development Team

Recent revisions

323. By Robert Ancell on 2013-12-04

[ Robert Ancell ]
* New upstream release (LP: #1316383)
* Drop all Unity customizations
* debian/control:
  - Build-depend on valac, libgirepository1.0-dev
  - Use standards-version 3.9.4
* debian/gnome-control-center.sh:
* debian/patches/02_new_goa.patch:
  - Build against newer libgoa
* debian/patches/git_iconview_columns.patch:
  - Set the number of columns, that seems needed with new GTK versions

[ Tim Lunn ]
* debian/control.in: Add build-depends on libnm-glib-vpn-dev (>= 0.9.8),
  libmm-glib-dev and libsmbclient-dev, remove a few duplicated build-deps
* debian/patches: drop all Ubuntu specific patches
* debian/patches/52_region_language.patch:
  - Adapt region panel to use Ubuntu style regions and UTF-8
* debian/patches/56_use_ubuntu_info_branding.patch:
  - Keep using this branding patch for now
* debian/patches/64_restore_terminal_keyboard_shortcut.patch:
  - Bring back terminal shortcut
* debian/patches/92_ubuntu_system_proxy.patch:
  - Add system proxy support
* debian/patches/99_add_lock-on-suspend.patch:
  - Add option to lock on suspend
* debian/patches/git_rename_natural_scrolling.patch:
  - change potentially offensive string
* debian/patches/git-background-*.patch:
  - Allow setting a different background for the GNOME Shell lock
    screen (LP: #1219188)
* debian/patches/revert_git_dont_hide_zoom.patch:
  - Bring back zoom settings
* debian/patches/ubuntu-external-panels.patch:
  - Reimplement support for external panels
* debian/libgnome-control-center1.symbols:
  - Add new symbols from external panel patch
* debian/patches/git_keyboard_grp_xkb_option.patch:
  - Dropped, included in new version

322. By Tim Lunn 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

321. By William Hua on 2014-04-08

* debian/patches/git_keyboard_grp_xkb_option.patch:
  - take upstream's grp xkb option combo for modifier-only input switching

320. By Sebastien Bacher on 2014-03-21

* debian/control.in, debian/gnome/control-center-data.install,
  - create a new binary with data files that are needed by g-c-c and u-c-c
    (the default selection of user icons for example) (lp: #1291608)

319. By Sebastien Bacher on 2014-03-04

* debian/patches/gcc_not_in_unity.patch:
  - Unity was still listed in some panels, fix that (lp: #1286937)

318. By Sebastien Bacher on 2014-02-26

* debian/patches/gcc_not_in_unity.patch:
  - don't list "Unity" in OnlyShowIn, other g-c-c and u-c-c entries get
    duplicated in the Unity dash, when they both installed (lp: #1280872)
* debian/libgnome-control-center1.symbols,
  - dropped some unity specific changes

[ Brian Murray ]
* debian/source_gnome-control-center.py: Do not pass an empty list
  of plugin packages to apport. (LP: #1237119)

317. By Robert Ancell on 2014-01-09

[ Sebastien Bacher ]
* debian/gnome-control-center.links: drop old symlink that was used
  to add a system-settings entry to indicator-session, that's deprecated

[ Brian Murray ]
* debian/source_gnome-control-center.py: Do not attempt to find the version
  of a package for a plugin not from a package. (LP: #1237119)

[ Robert Ancell ]
* debian/gnome-control-center.sh:
* debian/rules:
  - Add a wrapper to run unity-control-center in Unity
* debian/patches/10_keyboard_layout_on_unity.patch:
* debian/patches/ubuntu_update_translations_template.patch:
  - Rename unity-region-panel to gnome-unity-region-panel so it doesn't
    conflict with the one in unity-control-center

316. By Iain Lane on 2013-12-06

goa_provider_get_all went async in 3.10. Backport patch to deal with this.

315. By Sebastien Bacher on 2013-11-29

* debian/patches/git_iconview_columns.patch:
  - set the number of columns, that seems needed with new GTK versions
* debian/patches/ubuntu_update_translations_template.patch:
  - updated to list the current sources in use

314. By Mathieu Trudel-Lapierre on 2013-11-20

debian/patches/sanitize_ssid_convert_utf8.patch: make sure we properly
convert the SSID to UTF-8 where possible; using nm_utils_ssid_to_utf8(),
rather than nm_utils_escape_ssid() which isn't meant to be used that way.
(LP: #1198315)

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.