Unity Control Center

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

  1. crp-gcc-unity
  2. Merge into trunk
Proposed by Sebastien Bacher
Status: Merged
Approved by: Sebastien Bacher
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
Robert Ancell Approve
Iain Lane 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

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:12769
http://jenkins.qa.ubuntu.com/job/unity-control-center-ci/92/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-control-center-trusty-amd64-ci/92
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-control-center-trusty-armhf-ci/92/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-control-center-trusty-i386-ci/93

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-control-center-ci/92/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Robert Ancell (robert-ancell) wrote :

Might as well.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:12769
http://jenkins.qa.ubuntu.com/job/unity-control-center-ci/94/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-control-center-trusty-amd64-ci/94
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-control-center-trusty-armhf-ci/94
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-control-center-trusty-i386-ci/95

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-control-center-ci/94/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/control'
--- debian/control 2014-03-21 11:19:01 +0000
+++ debian/control 2014-04-03 13:03:32 +0000
@@ -85,8 +85,10 @@
85 system-config-printer-gnome,85 system-config-printer-gnome,
86 gnome-control-center-shared-data86 gnome-control-center-shared-data
87Conflicts: gnome-control-center (<< 1:3.6.3-0ubuntu50),87Conflicts: gnome-control-center (<< 1:3.6.3-0ubuntu50),
88 gnome-control-center-unity,
88 unity-control-center-datetime89 unity-control-center-datetime
89Replaces: gnome-bluetooth (<< 3.4.0),90Replaces: gnome-bluetooth (<< 3.4.0),
91 gnome-control-center-unity,
90 unity-control-center-datetime92 unity-control-center-datetime
91Breaks: gnome-power-manager (<< 3.0),93Breaks: gnome-power-manager (<< 3.0),
92 gnome-session (<< 3.0),94 gnome-session (<< 3.0),
@@ -100,7 +102,8 @@
100 gstreamer0.10-pulseaudio,102 gstreamer0.10-pulseaudio,
101 libcanberra-gtk-module,103 libcanberra-gtk-module,
102 x11-xserver-utils104 x11-xserver-utils
103Provides: unity-control-center-datetime105Provides: unity-control-center-datetime,
106 gnome-control-center-unity,
104Description: utilities to configure the GNOME desktop107Description: utilities to configure the GNOME desktop
105 This package contains configuration applets for the GNOME desktop,108 This package contains configuration applets for the GNOME desktop,
106 allowing to set accessibility configuration, desktop fonts, keyboard109 allowing to set accessibility configuration, desktop fonts, keyboard

Subscribers

People subscribed via source and target branches