Unity Control Center

Merge lp:~xnox/unity-control-center/utopic into lp:unity-control-center

  1. utopic
  2. Merge into trunk
Proposed by Dimitri John Ledkov
Status: Merged
Approved by: Robert Ancell
Approved revision: 12778
Merged at revision: 12778
Proposed branch: lp:~xnox/unity-control-center/utopic
Merge into: lp:unity-control-center
Diff against target: 25 lines (+7/-1)
2 files modified
debian/changelog (+6/-0)
debian/rules (+1/-1)
To merge this branch: bzr merge lp:~xnox/unity-control-center/utopic
Reviewer Review Type Date Requested Status
Sebastien Bacher Approve
Robert Ancell Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+216962@code.launchpad.net

Commit message

Update system information logo for Utopic Unicorn.

Description of the change

Update system information logo for Utopic Unicorn.

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

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

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

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

I've just branched lp:unity-control-center/14.04 so this is good to land. Someone needs to check that Jenkins is aware this branch is now for unicorn.

review: Approve
Revision history for this message
Sebastien Bacher (seb128) wrote :

Dimitri, since you upload manually (rather than letting us land that merge request) could you also commit manually to trunk to have things in sync?

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2014-04-10 14:27:11 +0000
+++ debian/changelog 2014-04-23 23:36:26 +0000
@@ -1,3 +1,9 @@
1unity-control-center (14.10.0+14.10.20140424-0ubuntu1) utopic; urgency=medium
2
3 * Update system information logo for Utopic Unicorn.
4
5 -- Dimitri John Ledkov <xnox@ubuntu.com> Thu, 24 Apr 2014 00:22:54 +0100
6
1unity-control-center (14.04.3+14.04.20140410-0ubuntu1) trusty; urgency=low7unity-control-center (14.04.3+14.04.20140410-0ubuntu1) trusty; urgency=low
28
3 [ Sebastien Bacher ]9 [ Sebastien Bacher ]
410
=== modified file 'debian/rules'
--- debian/rules 2014-02-25 09:34:14 +0000
+++ debian/rules 2014-04-23 23:36:26 +0000
@@ -17,6 +17,6 @@
1717
18binary-post-install/unity-control-center::18binary-post-install/unity-control-center::
19 dh_migrations -p$(cdbs_curpkg)19 dh_migrations -p$(cdbs_curpkg)
20 ./panels/info/logo-generator --logo panels/info/UbuntuLogoBlank.png --text "ubuntu 14.04 LTS" --output debian/unity-control-center/usr/share/unity-control-center/ui/UbuntuLogo.png20 ./panels/info/logo-generator --logo panels/info/UbuntuLogoBlank.png --text "ubuntu 14.10" --output debian/unity-control-center/usr/share/unity-control-center/ui/UbuntuLogo.png
2121
22common-binary-post-install-arch:: list-missing22common-binary-post-install-arch:: list-missing

Subscribers

People subscribed via source and target branches