[telepathy-mission-control-5.12] telepathy-mission-control: Prepare release

[Simon McVittie]

Module: telepathy-mission-control
Branch: telepathy-mission-control-5.12
Commit: e37277d17d9c7cbbb519e9e881d1582727b3acb2
URL:    http://cgit.freedesktop.org/telepathy/telepathy-mission-control/commit/?id=e37277d17d9c7cbbb519e9e881d1582727b3acb2

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Thu Sep  6 16:59:40 2012 +0100

Prepare release

---

 NEWS         |   10 +++++++++-
 configure.ac |    4 ++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/NEWS b/NEWS
index 74250eb..ca62639 100644
--- a/NEWS
+++ b/NEWS
@@ -1,8 +1,16 @@
-telepathy-mission-control 5.12.2 (UNRELEASED)
+telepathy-mission-control 5.12.2 (2012-09-06)
 =============================================
 
+The "Parasaurolophus" release.
+
 Fixes:
 
+• Passwords are now deleted from gnome-keyring correctly (fd.o #42088, Simon)
+• When migrating Butterfly accounts to Haze, do the migration even if Butterfly
+  isn't installed, and copy the password as well as the username
+  (Debian #686835, Simon)
+• If compiled with UPower support, do not attempt to connect while going
+  to sleep (Guillaume)
 • Set up the altered-one signal for account storage backends correctly
   (fd.o #52231, Xavier)
 • If service-activated under both names o.fd.Telepathy.MissionControl5
diff --git a/configure.ac b/configure.ac
index a499601..f7700b4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 dnl Set the version number to e.g. 5.x.y immediately before a release.
 dnl Set the version number to e.g. 5.x.y+ immediately after (this will
 dnl enable -Werror).
-AC_INIT([telepathy-mission-control], [5.12.1+])
+AC_INIT([telepathy-mission-control], [5.12.2])
 
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR(Makefile.am)
@@ -46,7 +46,7 @@ AC_SUBST([MCP_API_VERSION])
 # else if library source has changed since last release
 #     increment revision
 MCP_LT_CURRENT=3
-MCP_LT_REVISION=1
+MCP_LT_REVISION=2
 MCP_LT_AGE=3
 AC_SUBST([MCP_LT_CURRENT])
 AC_SUBST([MCP_LT_REVISION])