From 18916f971fa2aa26aefd4e03122f018dbebb3704 Mon Sep 17 00:00:00 2001
From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Thu, 24 Feb 2011 15:50:31 +0100
Subject: prepare 0.13.15

---
 NEWS                                     | 16 +++++++++++++++-
 configure.ac                             |  4 ++--
 telepathy-glib/abi.am                    |  1 +
 telepathy-glib/base-password-channel.c   |  6 +++---
 telepathy-glib/simple-password-manager.c |  4 ++--
 telepathy-glib/util.c                    |  2 +-
 telepathy-glib/versions/0.13.15.abi      |  8 ++++++++
 7 files changed, 32 insertions(+), 9 deletions(-)
 create mode 100644 telepathy-glib/versions/0.13.15.abi

diff --git a/NEWS b/NEWS
index c17380156..1773e1837 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,20 @@
-telepathy-glib 0.13.14 (UNRELEASED)
+telepathy-glib 0.13.15 (2011-02-24)
 ===================================
 
+The “Continents all made of clay” release.
+
+Enhancements:
+
+• Update to spec 0.21.10 (Guillaume)
+  · TP_PROP_CHANNEL_INTERFACE_SASL_AUTHENTICATION_MAY_SAVE_RESPONSE
+
+• tp_utf8_make_valid(): an UTF-8 string validation function. (Senko)
+
+• SimplePasswordManager now has API to let the CM create its own
+  SASL channel. (Jonner)
+
+• TpBasePasswordChannel: a base class to implement SASL channels. (Jonner)
+
 telepathy-glib 0.13.14 (2011-02-23)
 ===================================
 
diff --git a/configure.ac b/configure.ac
index 469e19e25..7c48ae34f 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], [13])
-m4_define([tp_glib_micro_version], [14])
-m4_define([tp_glib_nano_version], [1])
+m4_define([tp_glib_micro_version], [15])
+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,
diff --git a/telepathy-glib/abi.am b/telepathy-glib/abi.am
index c23484519..4dc8c1aa9 100644
--- a/telepathy-glib/abi.am
+++ b/telepathy-glib/abi.am
@@ -64,6 +64,7 @@ ABI_LISTS = \
     versions/0.13.12.abi \
     versions/0.13.13.abi \
     versions/0.13.14.abi \
+    versions/0.13.15.abi \
     $(NULL)
 
 # The quoting here is unnecessary but harmless, and has the useful side-effect
diff --git a/telepathy-glib/base-password-channel.c b/telepathy-glib/base-password-channel.c
index ac9692b71..414f854f0 100644
--- a/telepathy-glib/base-password-channel.c
+++ b/telepathy-glib/base-password-channel.c
@@ -32,7 +32,7 @@
  * should derive your channel from this class and then pass the channel as an
  * argument to tp_base_password_manager_prompt_for_channel_async().
  *
- * Since: 0.13.UNRELEASED
+ * Since: 0.13.15
  */
 
 /**
@@ -41,7 +41,7 @@
  * Data structure representing a channel implementing a SASL Authentication
  * channel with the X-TELEPATHY-PASSWORD SASL mechanism.
  *
- * Since: 0.13.UNRELEASED
+ * Since: 0.13.15
  */
 
 /**
@@ -387,7 +387,7 @@ tp_base_password_channel_class_init (TpBasePasswordChannelClass *tp_base_passwor
    * Emitted when either the password has been provided by the user or the
    * authentication has been aborted.
    *
-   * Since: 0.13.UNRELEASED
+   * Since: 0.13.15
    */
   signals[FINISHED] = g_signal_new ("finished",
       G_TYPE_FROM_CLASS (object_class),
diff --git a/telepathy-glib/simple-password-manager.c b/telepathy-glib/simple-password-manager.c
index 13343a348..82d25445a 100644
--- a/telepathy-glib/simple-password-manager.c
+++ b/telepathy-glib/simple-password-manager.c
@@ -382,7 +382,7 @@ tp_simple_password_manager_prompt_common_async (
  * automatically.  This may be useful if your SASL channel needs to implement
  * additional interfaces (such as Channel.Interface.CredentialsStorage)
  *
- * Since: 0.13.UNRELEASED
+ * Since: 0.13.15
  */
 void
 tp_simple_password_manager_prompt_for_channel_async (
@@ -496,7 +496,7 @@ tp_simple_password_manager_prompt_finish (
  * Returns: (transfer none): a #GString with the password (or byte-blob)
  * retrieved by @manager
  *
- * Since: 0.13.UNRELEASED
+ * Since: 0.13.15
  */
 const GString *
 tp_simple_password_manager_prompt_for_channel_finish (
diff --git a/telepathy-glib/util.c b/telepathy-glib/util.c
index 2a501e5d9..00d5b292c 100644
--- a/telepathy-glib/util.c
+++ b/telepathy-glib/util.c
@@ -1587,7 +1587,7 @@ _tp_create_channel_request_list (TpDBusDaemon *dbus,
  *
  * Returns: a new valid UTF8 string
  *
- * Since: 0.13.UNRELEASED
+ * Since: 0.13.15
  */
 gchar *
 tp_utf8_make_valid (const gchar *name)
diff --git a/telepathy-glib/versions/0.13.15.abi b/telepathy-glib/versions/0.13.15.abi
new file mode 100644
index 000000000..08539b7a6
--- /dev/null
+++ b/telepathy-glib/versions/0.13.15.abi
@@ -0,0 +1,8 @@
+Version: TELEPATHY_GLIB_0.13.15
+Extends: TELEPATHY_GLIB_0.13.14
+Release: 0.13.15
+
+tp_base_password_channel_get_type
+tp_simple_password_manager_prompt_for_channel_finish
+tp_simple_password_manager_prompt_for_channel_async
+tp_utf8_make_valid
-- 
cgit v1.2.3