prepare 0.19.6telepathy-glib-0.19.6

6 files changed, 20 insertions, 8 deletions

diff --git a/NEWS b/NEWS
index adcf07c19..585b7f0ce 100644
--- a/NEWS
+++ b/NEWS
@@ -1,11 +1,17 @@
-telepathy-glib 0.19.6 (UNRELEASED)
+telepathy-glib 0.19.6 (2012-08-06)
 ==================================
 
+Enhancements:
+
+• Add tp_account_manager_can_set_default() (Guillaume)
+
 Fixes:
 
 • Fix generation of reentrant-methods.list in highly parallel builds
   (fd.o #52480, Ross Burton)
 
+• TpBaseChannel: assert that the subclass sets TargetHandleType. (Will)
+
 telepathy-glib 0.19.5 (2012-07-24)
 ==================================
 
diff --git a/configure.ac b/configure.ac
index 596c19038..a0c07c597 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,8 +11,8 @@ AC_PREREQ([2.59])
 
 m4_define([tp_glib_major_version], [0])
 m4_define([tp_glib_minor_version], [19])
-m4_define([tp_glib_micro_version], [5])
-m4_define([tp_glib_nano_version], [1])
+m4_define([tp_glib_micro_version], [6])
+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,
@@ -26,9 +26,9 @@ m4_define([tp_glib_nano_version], [1])
 # (we don't guarantee that we won't add ABI then remove it again, if it was
 # never seen in a release).
 
-m4_define([tp_glib_lt_current], [74])
-m4_define([tp_glib_lt_revision], [1])
-m4_define([tp_glib_lt_age], [74])
+m4_define([tp_glib_lt_current], [75])
+m4_define([tp_glib_lt_revision], [0])
+m4_define([tp_glib_lt_age], [75])
 
 # Some magic
 m4_define([tp_glib_base_version],
diff --git a/telepathy-glib/abi.am b/telepathy-glib/abi.am
index 42d2adce4..1de738667 100644
--- a/telepathy-glib/abi.am
+++ b/telepathy-glib/abi.am
@@ -90,6 +90,7 @@ ABI_LISTS = \
     versions/0.19.2.abi \
     versions/0.19.3.abi \
     versions/0.19.4.abi \
+    versions/0.19.6.abi \
     $(NULL)
 
 # The quoting here is unnecessary but harmless, and has the useful side-effect
diff --git a/telepathy-glib/account-manager.c b/telepathy-glib/account-manager.c
index 8b9516de0..eb5996273 100644
--- a/telepathy-glib/account-manager.c
+++ b/telepathy-glib/account-manager.c
@@ -846,7 +846,7 @@ tp_account_manager_set_default (TpAccountManager *manager)
  * Returns: %TRUE if tp_account_manager_set_default() has already successfully
  * been called in this process, %FALSE otherwise.
  *
- * Since: UNRELEASED
+ * Since: 0.19.6
  */
 gboolean
 tp_account_manager_can_set_default (void)
diff --git a/telepathy-glib/account-manager.h b/telepathy-glib/account-manager.h
index 42b70b4be..58e1e19ae 100644
--- a/telepathy-glib/account-manager.h
+++ b/telepathy-glib/account-manager.h
@@ -83,7 +83,7 @@ TpAccountManager *tp_account_manager_new_with_factory (
 _TP_AVAILABLE_IN_0_16
 void tp_account_manager_set_default (TpAccountManager *manager);
 
-_TP_AVAILABLE_IN_UNRELEASED
+_TP_AVAILABLE_IN_0_20
 gboolean tp_account_manager_can_set_default (void);
 
 TpAccountManager *tp_account_manager_dup (void) G_GNUC_WARN_UNUSED_RESULT;
diff --git a/telepathy-glib/versions/0.19.6.abi b/telepathy-glib/versions/0.19.6.abi
new file mode 100644
index 000000000..7f8d5ffb2
--- /dev/null
+++ b/telepathy-glib/versions/0.19.6.abi
@@ -0,0 +1,5 @@
+Version: TELEPATHY_GLIB_0.19.6
+Extends: TELEPATHY_GLIB_0.19.4
+Release: 0.19.6
+
+tp_account_manager_can_set_default