Merge lp:~seb128/unity-control-center/crp-gcc-unity into lp:unity-control-center

Proposed by Sebastien Bacher on 2014-04-03
Status: Merged
Approved by: Sebastien Bacher on 2014-04-04
Approved revision: 12769
Merged at revision: 12770
Proposed branch: lp:~seb128/unity-control-center/crp-gcc-unity
Merge into: lp:unity-control-center
Diff against target: 24 lines (+4/-1)
1 file modified
debian/control (+4/-1)
To merge this branch: bzr merge lp:~seb128/unity-control-center/crp-gcc-unity
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve on 2014-04-03
Robert Ancell 2014-04-03 Approve on 2014-04-03
Iain Lane 2014-04-03 Pending
Review via email: mp+214018@code.launchpad.net

Commit message

Conflicts/Replaces/Provides gnome-control-center-unity

Description of the change

Conflicts/Replaces/Provides gnome-control-center-unity

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2014-03-21 11:19:01 +0000
3+++ debian/control 2014-04-03 13:03:32 +0000
4@@ -85,8 +85,10 @@
5 system-config-printer-gnome,
6 gnome-control-center-shared-data
7 Conflicts: gnome-control-center (<< 1:3.6.3-0ubuntu50),
8+ gnome-control-center-unity,
9 unity-control-center-datetime
10 Replaces: gnome-bluetooth (<< 3.4.0),
11+ gnome-control-center-unity,
12 unity-control-center-datetime
13 Breaks: gnome-power-manager (<< 3.0),
14 gnome-session (<< 3.0),
15@@ -100,7 +102,8 @@
16 gstreamer0.10-pulseaudio,
17 libcanberra-gtk-module,
18 x11-xserver-utils
19-Provides: unity-control-center-datetime
20+Provides: unity-control-center-datetime,
21+ gnome-control-center-unity,
22 Description: utilities to configure the GNOME desktop
23 This package contains configuration applets for the GNOME desktop,
24 allowing to set accessibility configuration, desktop fonts, keyboard

Subscribers

People subscribed via source and target branches