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

Proposed by Dimitri John Ledkov on 2014-04-23
Status: Merged
Approved by: Robert Ancell on 2014-04-24
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 on 2014-04-24
Robert Ancell 2014-04-23 Approve on 2014-04-24
PS Jenkins bot (community) continuous-integration Approve on 2014-04-24
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.
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
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
1=== modified file 'debian/changelog'
2--- debian/changelog 2014-04-10 14:27:11 +0000
3+++ debian/changelog 2014-04-23 23:36:26 +0000
4@@ -1,3 +1,9 @@
5+unity-control-center (14.10.0+14.10.20140424-0ubuntu1) utopic; urgency=medium
6+
7+ * Update system information logo for Utopic Unicorn.
8+
9+ -- Dimitri John Ledkov <xnox@ubuntu.com> Thu, 24 Apr 2014 00:22:54 +0100
10+
11 unity-control-center (14.04.3+14.04.20140410-0ubuntu1) trusty; urgency=low
12
13 [ Sebastien Bacher ]
14
15=== modified file 'debian/rules'
16--- debian/rules 2014-02-25 09:34:14 +0000
17+++ debian/rules 2014-04-23 23:36:26 +0000
18@@ -17,6 +17,6 @@
19
20 binary-post-install/unity-control-center::
21 dh_migrations -p$(cdbs_curpkg)
22- ./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.png
23+ ./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
24
25 common-binary-post-install-arch:: list-missing

Subscribers

People subscribed via source and target branches