Merge lp:~didrocks/libunity/add-missing-changelog into lp:libunity

[Didier Roche]

Add missing changelog and bumped the version to the one in configure.ac

Add missing changelog and bumped the version to the one in configure.ac

[Timo Jyrinki (timo-jyrinki)]

Ok.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:200
http://s-jenkins:8080/job/libunity-ci/10/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/libunity-ci/./distribution=raring,flavor=amd64,label=pbuilder/10/console
    SUCCESS: http://s-jenkins:8080/job/libunity-ci/./distribution=raring,flavor=i386,label=pbuilder/10/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/libunity-ci/10//rebuild/?

review: Approve (continuous-integration)

=== modified file 'debian/changelog'
--- debian/changelog	2012-11-16 16:37:17 +0000
+++ debian/changelog	2012-11-30 14:20:57 +0000
@@ -1,4 +1,4 @@
-libunity (6.11.0-0ubuntu1) UNRELEASED; urgency=low
+libunity (6.90.0-0ubuntu1) UNRELEASED; urgency=low
 
   [ Michael Terry ]
   * New upstream release
@@ -17,6 +17,14 @@
 
  -- Michael Terry <[e-mail]>  Mon, 05 Nov 2012 15:47:54 -0500
 
+libunity (6.12.0-0ubuntu1) quantal-proposed; urgency=low
+
+  * New upstream release.
+    - Fix crash when adding or removing players from the blacklist.
+      (LP: #1029949)
+
+ -- Timo Jyrinki <[e-mail]>  Thu, 08 Nov 2012 08:28:18 +0200
+
 libunity (6.10.0-0ubuntu1) quantal-proposed; urgency=low
 
   * New upstream release.