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

[Tim Lunn]

[Marc Deslauriers (mdeslaur)]

ACK, looks good, uploading to vivid.

Thanks!

review: Approve

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