lp:~darkxst/ubuntu/utopic/gnome-control-center/lp1299912

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~ubuntu-desktop/gnome-control-center/ubuntu at revision 640

Martin Pitt: Approve on 2014-05-07

Diff: 186 lines (+117/-2)

7 files modified

debian/changelog (+10/-0)
debian/control.in (+3/-0)
debian/gnome-control-center-data.install (+0/-1)
debian/patches/series (+1/-0)
debian/patches/ubuntu-gnome-version.patch (+101/-0)
debian/rules (+1/-0)
debian/source/include-binaries (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1299912: Ubuntu 14.04 report as 13.10

Undecided

Fix Released

Link a bug report

Related blueprints

641. By Tim Lunn on 2014-05-05

debian/control.in: also add build-dep on libkrb5-dev to fix FTBS on utopic

640. By Tim Lunn on 2014-05-05

* 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

639. By Sebastien Bacher on 2014-04-10

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

638. By William Hua on 2014-04-10

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

637. By Sebastien Bacher on 2014-03-21

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

636. By Sebastien Bacher on 2014-03-21

* debian/control.in, debian/gnome/control-center-data.install,
  debian/gnome-control-center-shared-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)

635. By Sebastien Bacher on 2014-03-04

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

634. 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)

633. By Sebastien Bacher on 2014-02-26

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

632. 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,
  debian/patches/10_keyboard_layout_on_unity.patch,
  debian/patches/input-sources-text-entry.patch,
  debian/patches/sound_nua_panel.patch,
  debian/patches/unity_menus.patch,
  debian/patches/unity_notice_info.patch:
  - dropped some unity specific changes