Merge lp:~darkxst/gnome-control-center/version_bump_in_details into lp:~ubuntu-desktop/gnome-control-center/ubuntu

Proposed by Tim Lunn on 2015-03-26
Status: Merged
Merge reported by: Marc Deslauriers
Merged at revision: not available
Proposed branch: lp:~darkxst/gnome-control-center/version_bump_in_details
Merge into: lp:~ubuntu-desktop/gnome-control-center/ubuntu
Diff against target: 26 lines (+7/-1)
2 files modified
debian/changelog (+6/-0)
debian/patches/ubuntu-gnome-version.patch (+1/-1)
To merge this branch: bzr merge lp:~darkxst/gnome-control-center/version_bump_in_details
Reviewer Review Type Date Requested Status
Marc Deslauriers 2015-03-26 Approve on 2015-03-31
Review via email: mp+254312@code.launchpad.net
To post a comment you must log in.
Marc Deslauriers (mdeslaur) wrote :

ACK, looks good, uploading to vivid.

Thanks!

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 2015-01-27 09:48:15 +0000
3+++ debian/changelog 2015-03-26 21:24:17 +0000
4@@ -1,3 +1,9 @@
5+gnome-control-center (1:3.14.2-2ubuntu3) UNRELEASED; urgency=medium
6+
7+ * d/p/ubuntu-gnome-version.patch: Bump version to 15.04 (LP: #1436974)
8+
9+ -- Tim Lunn <tim@feathertop.org> Fri, 27 Mar 2015 08:10:27 +1100
10+
11 gnome-control-center (1:3.14.2-2ubuntu2) vivid; urgency=medium
12
13 [ Alberts Muktupāvels ]
14
15=== modified file 'debian/patches/ubuntu-gnome-version.patch'
16--- debian/patches/ubuntu-gnome-version.patch 2014-09-23 23:45:16 +0000
17+++ debian/patches/ubuntu-gnome-version.patch 2015-03-26 21:24:17 +0000
18@@ -48,7 +48,7 @@
19 noinst_LTLIBRARIES = libinfo.la
20
21 +UbuntuLogo.png: logo-generator
22-+ ./logo-generator --logo UbuntuLogoBlank.png --text "ubuntu 14.10" --output UbuntuLogo.png
23++ ./logo-generator --logo UbuntuLogoBlank.png --text "ubuntu 15.04" --output UbuntuLogo.png
24 +
25 BUILT_SOURCES = \
26 + UbuntuLogo.png \

Subscribers

People subscribed via source and target branches