Prepare release 0.11.1telepathy-glib-0.11.1

8 files changed, 42 insertions, 12 deletions

diff --git a/NEWS b/NEWS
index e252c9fd2..e532857f6 100644
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,24 @@
-telepathy-glib 0.11.1 (UNRELEASED)
+telepathy-glib 0.11.1 (2010-04-05)
 ==================================
 
-...
+The “26-bit address bus” release.
+
+Enhancements:
+
+◈ Add tp_str_empty() macro, a shortcut for ‘NULL or ""’ (smcv)
+
+◈ Add TP_TYPE_UCHAR_ARRAY, a dbus-glib GArray of guchar (i.e. the default
+  representation for the D-Bus 'ay' type) (cassidy)
+
+◈ Add tp_account_set_avatar_async() (cassidy)
+
+Fixes:
+
+◈ Only fail “make check” on documentation warnings in unreleased versions, to
+  avoid build failures in releases when gtk-doc in a distribution doesn't have
+  the same definition of full coverage that we do (smcv)
+
+◈ Fix compatibility with gtk-doc 1.14 (smcv)
 
 telepathy-glib 0.11.0 (2010-03-31)
 ==================================
diff --git a/configure.ac b/configure.ac
index be50cd1d3..60d2126c8 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], [11])
-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,
@@ -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], [33])
+m4_define([tp_glib_lt_current], [34])
 m4_define([tp_glib_lt_revision], [0])
-m4_define([tp_glib_lt_age], [33])
+m4_define([tp_glib_lt_age], [34])
 
 # Some magic
 m4_define([tp_glib_base_version],
diff --git a/telepathy-glib/Makefile.am b/telepathy-glib/Makefile.am
index 55455c8f1..f6109eb8a 100644
--- a/telepathy-glib/Makefile.am
+++ b/telepathy-glib/Makefile.am
@@ -42,7 +42,8 @@ ABI_LISTS = \
     versions/0.7.37.abi \
     versions/0.9.0.abi \
     versions/0.9.2.abi \
-    versions/0.11.0.abi
+    versions/0.11.0.abi \
+    versions/0.11.1.abi
 
 EXTRA_DIST = \
     $(ABI_LISTS) \
diff --git a/telepathy-glib/account.c b/telepathy-glib/account.c
index a5072d8d2..a5e5c803c 100644
--- a/telepathy-glib/account.c
+++ b/telepathy-glib/account.c
@@ -2828,7 +2828,7 @@ _tp_account_refresh_properties (TpAccount *account)
  *
  * Returns: %TRUE if the operation was successful, otherwise %FALSE
  *
- * Since: 0.11.UNRELEASED
+ * Since: 0.11.1
  */
 gboolean
 tp_account_set_avatar_finish (TpAccount *self,
@@ -2867,7 +2867,7 @@ tp_account_set_avatar_finish (TpAccount *self,
  *
  * If @len equals 0, the avatar is cleared.
  *
- * Since: 0.11.UNRELEASED
+ * Since: 0.11.1
  */
 void
 tp_account_set_avatar_async (TpAccount *self,
diff --git a/telepathy-glib/contact.c b/telepathy-glib/contact.c
index 79c943b3b..6a75069a9 100644
--- a/telepathy-glib/contact.c
+++ b/telepathy-glib/contact.c
@@ -86,7 +86,7 @@ struct _TpContact {
  * @TP_CONTACT_FEATURE_AVATAR_TOKEN: #TpContact:avatar-token
  * @TP_CONTACT_FEATURE_PRESENCE: #TpContact:presence-type,
  *  #TpContact:presence-status and #TpContact:presence-message
- * @TP_CONTACT_FEATURE_LOCATION: #TpContact:location
+ * @TP_CONTACT_FEATURE_LOCATION: #TpContact:location (available since 0.11.1)
  * @NUM_TP_CONTACT_FEATURES: 1 higher than the highest TpContactFeature
  *  supported by this version of telepathy-glib
  *
@@ -370,7 +370,7 @@ tp_contact_get_presence_message (TpContact *self)
  *
  * Returns: the same #GHashTable (or %NULL) as the #TpContact:location property
  *
- * Since: 0.11.UNRELEASED
+ * Since: 0.11.1
  */
 GHashTable *
 tp_contact_get_location (TpContact *self)
@@ -669,6 +669,8 @@ tp_contact_class_init (TpContactClass *klass)
    * This may be %NULL even if the contact has set a location,
    * if this #TpContact object has not been set up to track
    * %TP_CONTACT_FEATURE_LOCATION.
+   *
+   * Since: 0.11.1
    */
   param_spec = g_param_spec_boxed ("location",
       "Location",
diff --git a/telepathy-glib/gtypes.c b/telepathy-glib/gtypes.c
index 0e9056fc5..028afacb6 100644
--- a/telepathy-glib/gtypes.c
+++ b/telepathy-glib/gtypes.c
@@ -85,7 +85,7 @@ tp_dbus_specialized_value_slice_new (GType type)
  * that returns the #GType of a #GArray
  * of %G_TYPE_UCHAR.
  *
- * Since: 0.11.UNRELEASED
+ * Since: 0.11.1
  */
 
 GType
diff --git a/telepathy-glib/util.c b/telepathy-glib/util.c
index dfa188736..b21dc4485 100644
--- a/telepathy-glib/util.c
+++ b/telepathy-glib/util.c
@@ -516,6 +516,8 @@ tp_g_hash_table_update (GHashTable *target,
  * Return %TRUE if @s is empty, counting %NULL as empty.
  *
  * Returns: (type boolean): %TRUE if @s is either %NULL or ""
+ *
+ * Since: 0.11.1
  */
 /* no definition here - it's inlined */
 
diff --git a/telepathy-glib/versions/0.11.1.abi b/telepathy-glib/versions/0.11.1.abi
new file mode 100644
index 000000000..fee764eaf
--- /dev/null
+++ b/telepathy-glib/versions/0.11.1.abi
@@ -0,0 +1,8 @@
+Version: TELEPATHY_GLIB_0.11.1
+Extends: TELEPATHY_GLIB_0.11.0
+Release: 0.11.1
+
+tp_contact_get_location
+tp_account_set_avatar_finish
+tp_account_set_avatar_async
+tp_type_dbus_array_of_y