[Pkg-telepathy-commits] [telepathy-glib] 06/111: 0.24 branch

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian
in repository telepathy-glib.

commit 03e2bb3d09b527c9144c3186d2f0f9aa7113aac9
Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Thu Sep 26 15:34:14 2013 +0100

    0.24 branch
---
 NEWS                                       | 2 +-
 configure.ac                               | 4 ++--
 docs/reference/telepathy-glib-sections.txt | 1 +
 telepathy-glib/defs.h                      | 1 +
 telepathy-glib/extra-gtkdoc.h              | 7 +++++++
 5 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/NEWS b/NEWS
index 0de15a4..f134e4b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-telepathy-glib 0.21.3 (UNRELEASED)
+telepathy-glib 0.23.0 (UNRELEASED)
 ==================================
 
 ...
diff --git a/configure.ac b/configure.ac
index 1071ec5..a30f61c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10,8 +10,8 @@ AC_PREREQ([2.60])
 #   set nano_version to 1
 
 m4_define([tp_glib_major_version], [0])
-m4_define([tp_glib_minor_version], [21])
-m4_define([tp_glib_micro_version], [2])
+m4_define([tp_glib_minor_version], [22])
+m4_define([tp_glib_micro_version], [99])
 m4_define([tp_glib_nano_version], [1])
 
 # If library source has changed since last release, increment revision
diff --git a/docs/reference/telepathy-glib-sections.txt b/docs/reference/telepathy-glib-sections.txt
index 9a0003b..5717105 100644
--- a/docs/reference/telepathy-glib-sections.txt
+++ b/docs/reference/telepathy-glib-sections.txt
@@ -45,6 +45,7 @@ TP_VERSION_0_16
 TP_VERSION_0_18
 TP_VERSION_0_20
 TP_VERSION_0_22
+TP_VERSION_0_24
 TP_VERSION_MIN_REQUIRED
 TP_VERSION_MAX_ALLOWED
 <SUBSECTION Private>
diff --git a/telepathy-glib/defs.h b/telepathy-glib/defs.h
index 80d24c1..327ff17 100644
--- a/telepathy-glib/defs.h
+++ b/telepathy-glib/defs.h
@@ -160,6 +160,7 @@ G_BEGIN_DECLS
 #define TP_VERSION_0_18 (_TP_ENCODE_VERSION (0, 18))
 #define TP_VERSION_0_20 (_TP_ENCODE_VERSION (0, 20))
 #define TP_VERSION_0_22 (_TP_ENCODE_VERSION (0, 22))
+#define TP_VERSION_0_24 (_TP_ENCODE_VERSION (0, 24))
 #define TP_VERSION_1_0 (_TP_ENCODE_VERSION (1, 0))
 
 #if (TP_MINOR_VERSION == 99)
diff --git a/telepathy-glib/extra-gtkdoc.h b/telepathy-glib/extra-gtkdoc.h
index 6731a95..b1e5860 100644
--- a/telepathy-glib/extra-gtkdoc.h
+++ b/telepathy-glib/extra-gtkdoc.h
@@ -471,6 +471,13 @@
  */
 
 /**
+ * TP_VERSION_0_24: (skip)
+ *
+ * A constant representing the telepathy-glib 0.24 stable branch,
+ * and the 0.23 development branch that led to it.
+ */
+
+/**
  * TP_VERSION_1_0: (skip)
  *
  * A constant representing the telepathy-glib 1.0 stable branch,

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-telepathy/telepathy-glib.git