Prepare version 0.12.1telepathy-glib-0.12.1

2 files changed, 27 insertions, 14 deletions

diff --git a/NEWS b/NEWS
index 60b7516b1..9cc769a7f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,28 @@
-telepathy-glib 0.12.1 (UNRELEASED)
+telepathy-glib 0.12.1 (2010-10-15)
 ==================================
 
-…
+The "your thighs are capacitive too" release.
+
+Enhancements:
+
+• When a Protocol's filter rejects a parameter, log the error message (wjt)
+
+• Improve the error message for an undefined D-Bus interface (wjt)
+
+• Check the GObject type of the self pointer in TpCapabilities methods (cassidy)
+
+Fixes:
+
+• fd.o #30644: don't 'return' a void expression from a void function, which
+  isn't valid C99 and breaks compilation on Sun Studio C (smcv)
+
+• Remove redundant trailing semicolons from G_DEFINE_TYPE etc., which are
+  not valid C99 (smcv)
+
+• Add DeliveryReportingSupport to the properties offered by TpMessageMixin
+  (cassidy)
+
+• Avoid using a gboolean (which is signed) as a one-bit bitfield (smcv)
 
 telepathy-glib 0.12.0 (2010-09-20)
 ==================================
diff --git a/configure.ac b/configure.ac
index e777ce90d..91bf44075 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,23 +11,15 @@ AC_PREREQ([2.59])
 
 m4_define([tp_glib_major_version], [0])
 m4_define([tp_glib_minor_version], [12])
-m4_define([tp_glib_micro_version], [0])
-m4_define([tp_glib_nano_version], [1])
+m4_define([tp_glib_micro_version], [1])
+m4_define([tp_glib_nano_version], [0])
 
 # If library source has changed since last release, increment revision
 # If interfaces have been added, removed or changed since last release,
-#  increment current and set revision to 0
-# If interfaces have been added since last release, increment age
-# If interfaces have been removed since last release, set age to 0
-#
-# If interfaces have been added, release builds will fail unless you add a new
-# file like telepathy-glib/versions/0.7.3.abi to add them to the official ABI.
-# This also forces binaries built against devel versions to be rebuilt
-# (we don't guarantee that we won't add ABI then remove it again, if it was
-# never seen in a release).
+#  you're on the wrong branch :-)
 
 m4_define([tp_glib_lt_current], [45])
-m4_define([tp_glib_lt_revision], [0])
+m4_define([tp_glib_lt_revision], [1])
 m4_define([tp_glib_lt_age], [45])
 
 # Some magic