prepare 0.15.0

7 files changed, 64 insertions, 14 deletions

diff --git a/NEWS b/NEWS
index 691bd37f..04ec4a51 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,34 @@
+telepathy-glib 0.15.0 (2011-05-17)
+==================================
+
+This first release in the 0.15 development cycle contains all the fixes
+released in 0.14.6.
+
+Dependencies:
+
+• GLib 2.28.0
+
+Enhancements:
+
+• Update to spec 0.23.2 (Guillaume):
+  · Generated code for Channel.Interface.SMS.GetSMSLength()
+  · Generated code for ChannelDispatcher.DelegateChannels() and
+    ChannelDispatcher.PresentChannel()
+
+• tp_channel_dispatch_operation_claim_with_async() replacing
+  tp_channel_dispatch_operation_claim_async() (fdo #36490 Guillaume)
+
+• TpProxyFeature is now part of the API allowing users to define their own
+  features (fdo #31583 Guillaume)
+
+• tp_base_client_delegate_channels_{async,finish} and
+  add tp_channel_dispatcher_present_channel_{async,finish}: high level
+  API to delegate and present channels (fdo #34610 Guillaume)
+
+• TpChannelDispatcher is now exported in the GIR file and so can be used using
+  gobject-introspection (Guillaume)
+
+
 telepathy-glib 0.14.6 (2011-05-16)
 ==================================
 
diff --git a/configure.ac b/configure.ac
index 8c266efd..57313051 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10,9 +10,9 @@ AC_PREREQ([2.59])
 #   set nano_version to 1
 
 m4_define([tp_glib_major_version], [0])
-m4_define([tp_glib_minor_version], [14])
-m4_define([tp_glib_micro_version], [6])
-m4_define([tp_glib_nano_version], [1])
+m4_define([tp_glib_minor_version], [15])
+m4_define([tp_glib_micro_version], [0])
+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], [56])
-m4_define([tp_glib_lt_revision], [1])
-m4_define([tp_glib_lt_age], [56])
+m4_define([tp_glib_lt_current], [57])
+m4_define([tp_glib_lt_revision], [0])
+m4_define([tp_glib_lt_age], [57])
 
 # Some magic
 m4_define([tp_glib_base_version],
diff --git a/telepathy-glib/abi.am b/telepathy-glib/abi.am
index 1cdbcf45..9e922898 100644
--- a/telepathy-glib/abi.am
+++ b/telepathy-glib/abi.am
@@ -70,6 +70,7 @@ ABI_LISTS = \
     versions/0.14.3.abi \
     versions/0.14.4.abi \
     versions/0.14.5.abi \
+    versions/0.15.0.abi \
     $(NULL)
 
 # The quoting here is unnecessary but harmless, and has the useful side-effect
diff --git a/telepathy-glib/base-client.c b/telepathy-glib/base-client.c
index 0856aea4..76bdea6b 100644
--- a/telepathy-glib/base-client.c
+++ b/telepathy-glib/base-client.c
@@ -2948,7 +2948,7 @@ delegate_channels_cb (TpChannelDispatcher *cd,
  * You can then call tp_base_client_delegate_channels_finish() to
  * get the result of the operation.
  *
- * Since: 0.15.UNRELEASED
+ * Since: 0.15.0
  */
 void
 tp_base_client_delegate_channels_async (TpBaseClient *self,
@@ -3021,7 +3021,7 @@ tp_base_client_delegate_channels_async (TpBaseClient *self,
  * can be used to know the channels that @self is not handling any more,
  * otherwise %FALSE.
  *
- * Since: 0.15.UNRELEASED
+ * Since: 0.15.0
  */
 gboolean
 tp_base_client_delegate_channels_finish (TpBaseClient *self,
diff --git a/telepathy-glib/channel-dispatch-operation.c b/telepathy-glib/channel-dispatch-operation.c
index 1c9366d0..12272288 100644
--- a/telepathy-glib/channel-dispatch-operation.c
+++ b/telepathy-glib/channel-dispatch-operation.c
@@ -1212,7 +1212,7 @@ claim_cb (TpChannelDispatchOperation *self,
  * the channels further in this case.
  *
  * Since: 0.11.5
- * Deprecated: since 0.15.UNRELEASED. Use
+ * Deprecated: since 0.15.0. Use
  * tp_channel_dispatch_operation_claim_with_async()
  */
 void
@@ -1243,7 +1243,7 @@ tp_channel_dispatch_operation_claim_async (
  * Returns: %TRUE if the Claim() call was successful, otherwise %FALSE
  *
  * Since: 0.11.5
- * Deprecated: since 0.15.UNRELEASED. Use
+ * Deprecated: since 0.15.0. Use
  * tp_channel_dispatch_operation_claim_with_finish()
  */
 gboolean
@@ -1464,7 +1464,7 @@ claim_with_cb (GObject *source,
  * This is an improved version of tp_channel_dispatch_operation_claim_async()
  * as it tells @client about the new channels being handled.
  *
- * Since: 0.15.UNRELEASED
+ * Since: 0.15.0
  */
 void
 tp_channel_dispatch_operation_claim_with_async (
@@ -1499,7 +1499,7 @@ tp_channel_dispatch_operation_claim_with_async (
  *
  * Returns: %TRUE if the Claim() call was successful, otherwise %FALSE
  *
- * Since: 0.15.UNRELEASED
+ * Since: 0.15.0
  */
 gboolean
 tp_channel_dispatch_operation_claim_with_finish (
diff --git a/telepathy-glib/channel-dispatcher.c b/telepathy-glib/channel-dispatcher.c
index bc9dce7e..31230473 100644
--- a/telepathy-glib/channel-dispatcher.c
+++ b/telepathy-glib/channel-dispatcher.c
@@ -199,7 +199,7 @@ present_channel_cb (TpChannelDispatcher *cd,
  * You can then call tp_channel_dispatcher_present_channel_finish() to
  * get the result of the operation.
  *
- * Since: 0.15.UNRELEASED
+ * Since: 0.15.0
  */
 void
 tp_channel_dispatcher_present_channel_async (TpChannelDispatcher *self,
@@ -232,7 +232,7 @@ tp_channel_dispatcher_present_channel_async (TpChannelDispatcher *self,
  *
  * Returns: %TRUE if the call succeeded, otherwise %FALSE.
  *
- * Since: 0.15.UNRELEASED
+ * Since: 0.15.0
  */
 gboolean
 tp_channel_dispatcher_present_channel_finish (TpChannelDispatcher *self,
diff --git a/telepathy-glib/versions/0.15.0.abi b/telepathy-glib/versions/0.15.0.abi
new file mode 100644
index 00000000..d2275adc
--- /dev/null
+++ b/telepathy-glib/versions/0.15.0.abi
@@ -0,0 +1,18 @@
+Version: TELEPATHY_GLIB_0.15.0
+Extends: TELEPATHY_GLIB_0.14.5
+Release: 0.15.0
+
+tp_base_client_delegate_channels_async
+tp_base_client_delegate_channels_finish
+tp_channel_dispatch_operation_claim_with_async
+tp_channel_dispatch_operation_claim_with_finish
+tp_channel_dispatcher_present_channel_async
+tp_channel_dispatcher_present_channel_finish
+tp_cli_channel_dispatcher_call_delegate_channels
+tp_cli_channel_dispatcher_call_present_channel
+tp_cli_channel_interface_sms_call_get_sms_length
+tp_cli_channel_interface_sms_run_get_sms_length
+tp_svc_channel_dispatcher_implement_delegate_channels
+tp_svc_channel_dispatcher_implement_present_channel
+tp_svc_channel_interface_sms_implement_get_sms_length
+tp_type_dbus_hash_o_28ss_29