summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2012-09-20 13:21:47 +0100
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2012-09-20 13:21:47 +0100
commit010ab4ba86f557f89e1ec2045dc9fc5ae71513ad (patch)
tree0815ab0bd2984d3b45f19177f28fd0876b2d1df5
parent17965ae51796f93771a6444e90f6846639b68a9b (diff)
downloadtelepathy-mission-control-010ab4ba86f557f89e1ec2045dc9fc5ae71513ad.tar.gz
Prepare version 5.12.3telepathy-mission-control-5.12.3
-rw-r--r--NEWS14
-rw-r--r--configure.ac4
2 files changed, 14 insertions, 4 deletions
diff --git a/NEWS b/NEWS
index 5a50738f..75869c9f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,17 @@
-telepathy-mission-control 5.12.3 (UNRELEASED)
+telepathy-mission-control 5.12.3 (2012-09-20)
=============================================
-...
+The "put it with the other Kryptonite" release.
+
+Fixes:
+
+• Recover from incomplete password migrations caused by upgrading to
+ Empathy 3 while running MC 5.12.1 or older, by deleting the old (MC) copy
+ of the password if Empathy has already copied it (fd.o #42088, Simon)
+• Omit generated file mcp-signals-marshal.h from tarballs (Simon)
+• Fix distcheck in out-of-tree builds (Simon)
+• Backport a patch from 5.13.1 to make the gnome-keyring regression test
+ work with modern gnome-keyring (Simon)
telepathy-mission-control 5.12.2 (2012-09-06)
=============================================
diff --git a/configure.ac b/configure.ac
index 2e126148..940485ad 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.2+])
+AC_INIT([telepathy-mission-control], [5.12.3])
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=2
+MCP_LT_REVISION=3
MCP_LT_AGE=3
AC_SUBST([MCP_LT_CURRENT])
AC_SUBST([MCP_LT_REVISION])