Merge lp:~xnox/unity-greeter/vivid-logo into lp:unity-greeter

[Dimitri John Ledkov]

Update greeter logo for Vivid Vervet.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1449
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~xnox/unity-greeter/vivid-logo/+merge/243014/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity-greeter-ci/53/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-greeter-vivid-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-greeter-vivid-armhf-ci/1

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-greeter-ci/53/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'debian/changelog'
--- debian/changelog	2014-08-21 21:50:24 +0000
+++ debian/changelog	2014-11-27 10:32:50 +0000
@@ -1,3 +1,9 @@
+unity-greeter (15.04.1-0ubuntu1) UNRELEASED; urgency=medium
+
+  * Update greeter logo for Vivid Vervet.
+
+ -- Dimitri John Ledkov <[e-mail]>  Thu, 27 Nov 2014 10:18:19 +0000
+
 unity-greeter (14.10.2-0ubuntu1) utopic; urgency=medium
 
   * New upstream release:
 
=== modified file 'debian/rules'
--- debian/rules	2014-04-23 23:01:57 +0000
+++ debian/rules	2014-11-27 10:32:50 +0000
@@ -11,7 +11,7 @@
 
 override_dh_auto_build:
 	dh_auto_build
-	./src/logo-generator --logo data/logo-bare.png --text '14.10' --output logo.png
+	./src/logo-generator --logo data/logo-bare.png --text '15.04' --output logo.png
 
 override_dh_auto_install:
 	dh_auto_install