[Pkg-telepathy-commits] [SCM] telepathy-glib packaging branch, debian-experimental, updated. debian/0.19.0-1-3-gf8fe7e5

Simon McVittie smcv at debian.org
Thu Jun 7 10:05:33 UTC 2012


The following commit has been merged in the debian-experimental branch:
commit f8fe7e5c60547840759032e333c8e725b7e1927d
Author: Simon McVittie <smcv at debian.org>
Date:   Thu Jun 7 11:03:38 2012 +0100

    New upstream release
    
    * New upstream release
      - drop patch from 0.19.0-1, no longer needed
      - update symbols file

diff --git a/debian/changelog b/debian/changelog
index 21a56fc..fab0f2a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+telepathy-glib (0.19.1-1) UNRELEASED; urgency=low
+
+  * New upstream release
+    - drop patch from 0.19.0-1, no longer needed
+    - update symbols file
+
+ -- Simon McVittie <smcv at debian.org>  Thu, 07 Jun 2012 10:53:09 +0100
+
 telepathy-glib (0.19.0-1) experimental; urgency=low
 
   * New upstream release
diff --git a/debian/libtelepathy-glib0.symbols b/debian/libtelepathy-glib0.symbols
index dcaf30b..cd93499 100644
--- a/debian/libtelepathy-glib0.symbols
+++ b/debian/libtelepathy-glib0.symbols
@@ -50,6 +50,7 @@ libtelepathy-glib.so.0 libtelepathy-glib0 #MINVER#
  TELEPATHY_GLIB_0.17.7 at TELEPATHY_GLIB_0.17.7 0.17.7
  TELEPATHY_GLIB_0.18.0 at TELEPATHY_GLIB_0.18.0 0.18.0
  TELEPATHY_GLIB_0.19.0 at TELEPATHY_GLIB_0.19.0 0.19.0
+ TELEPATHY_GLIB_0.19.1 at TELEPATHY_GLIB_0.19.1 0.19.1
  TELEPATHY_GLIB_0.7.0 at TELEPATHY_GLIB_0.7.0 0.7.1
  TELEPATHY_GLIB_0.7.10 at TELEPATHY_GLIB_0.7.10 0.7.10
  TELEPATHY_GLIB_0.7.12 at TELEPATHY_GLIB_0.7.12 0.7.12
@@ -187,8 +188,26 @@ libtelepathy-glib.so.0 libtelepathy-glib0 #MINVER#
  tp_account_reconnect_finish at TELEPATHY_GLIB_0.9.0 0.9.0
  tp_account_remove_async at TELEPATHY_GLIB_0.9.0 0.9.0
  tp_account_remove_finish at TELEPATHY_GLIB_0.9.0 0.9.0
+ tp_account_request_add_supersedes at TELEPATHY_GLIB_0.19.1 0.19.1
+ tp_account_request_create_account_async at TELEPATHY_GLIB_0.19.1 0.19.1
+ tp_account_request_create_account_finish at TELEPATHY_GLIB_0.19.1 0.19.1
+ tp_account_request_get_type at TELEPATHY_GLIB_0.19.1 0.19.1
+ tp_account_request_new at TELEPATHY_GLIB_0.19.1 0.19.1
+ tp_account_request_new_from_protocol at TELEPATHY_GLIB_0.19.1 0.19.1
  tp_account_request_presence_async at TELEPATHY_GLIB_0.9.0 0.9.0
  tp_account_request_presence_finish at TELEPATHY_GLIB_0.9.0 0.9.0
+ tp_account_request_set_automatic_presence at TELEPATHY_GLIB_0.19.1 0.19.1
+ tp_account_request_set_avatar at TELEPATHY_GLIB_0.19.1 0.19.1
+ tp_account_request_set_connect_automatically at TELEPATHY_GLIB_0.19.1 0.19.1
+ tp_account_request_set_display_name at TELEPATHY_GLIB_0.19.1 0.19.1
+ tp_account_request_set_enabled at TELEPATHY_GLIB_0.19.1 0.19.1
+ tp_account_request_set_icon_name at TELEPATHY_GLIB_0.19.1 0.19.1
+ tp_account_request_set_nickname at TELEPATHY_GLIB_0.19.1 0.19.1
+ tp_account_request_set_parameter at TELEPATHY_GLIB_0.19.1 0.19.1
+ tp_account_request_set_parameter_string at TELEPATHY_GLIB_0.19.1 0.19.1
+ tp_account_request_set_requested_presence at TELEPATHY_GLIB_0.19.1 0.19.1
+ tp_account_request_set_service at TELEPATHY_GLIB_0.19.1 0.19.1
+ tp_account_request_unset_parameter at TELEPATHY_GLIB_0.19.1 0.19.1
  tp_account_set_automatic_presence_async at TELEPATHY_GLIB_0.13.8 0.13.8
  tp_account_set_automatic_presence_finish at TELEPATHY_GLIB_0.13.8 0.13.8
  tp_account_set_avatar_async at TELEPATHY_GLIB_0.11.1 0.11.1
@@ -347,14 +366,19 @@ libtelepathy-glib.so.0 libtelepathy-glib0 #MINVER#
  tp_base_connection_change_status at TELEPATHY_GLIB_0.7.0 0.7.1
  tp_base_connection_channel_manager_iter_init at TELEPATHY_GLIB_0.7.15 0.7.15
  tp_base_connection_channel_manager_iter_next at TELEPATHY_GLIB_0.7.15 0.7.15
+ tp_base_connection_check_connected at TELEPATHY_GLIB_0.19.1 0.19.1
  tp_base_connection_dbus_request_handles at TELEPATHY_GLIB_0.7.0 0.7.1
  tp_base_connection_disconnect_with_dbus_error at TELEPATHY_GLIB_0.7.24 0.7.24
  tp_base_connection_disconnect_with_dbus_error_vardict at TELEPATHY_GLIB_0.19.0 0.19.0
  tp_base_connection_finish_shutdown at TELEPATHY_GLIB_0.7.0 0.7.1
+ tp_base_connection_get_bus_name at TELEPATHY_GLIB_0.19.1 0.19.1
  tp_base_connection_get_dbus_daemon at TELEPATHY_GLIB_0.11.3 0.11.3
  tp_base_connection_get_handles at TELEPATHY_GLIB_0.7.0 0.7.1
+ tp_base_connection_get_object_path at TELEPATHY_GLIB_0.19.1 0.19.1
  tp_base_connection_get_self_handle at TELEPATHY_GLIB_0.7.15 0.7.15
+ tp_base_connection_get_status at TELEPATHY_GLIB_0.19.1 0.19.1
  tp_base_connection_get_type at TELEPATHY_GLIB_0.7.0 0.7.1
+ tp_base_connection_is_destroyed at TELEPATHY_GLIB_0.19.1 0.19.1
  tp_base_connection_manager_add_protocol at TELEPATHY_GLIB_0.11.11 0.11.11
  tp_base_connection_manager_get_dbus_daemon at TELEPATHY_GLIB_0.11.3 0.11.3
  tp_base_connection_manager_get_type at TELEPATHY_GLIB_0.7.0 0.7.1
@@ -1935,6 +1959,7 @@ libtelepathy-glib.so.0 libtelepathy-glib0 #MINVER#
  tp_protocol_get_authentication_types at TELEPATHY_GLIB_0.13.9 0.13.9
  tp_protocol_get_avatar_requirements at TELEPATHY_GLIB_0.15.6 0.15.6
  tp_protocol_get_capabilities at TELEPATHY_GLIB_0.11.11 0.11.11
+ tp_protocol_get_cm_name at TELEPATHY_GLIB_0.19.1 0.19.1
  tp_protocol_get_english_name at TELEPATHY_GLIB_0.11.11 0.11.11
  tp_protocol_get_feature_quark_core at TELEPATHY_GLIB_0.11.11 0.11.11
  tp_protocol_get_feature_quark_parameters at TELEPATHY_GLIB_0.11.11 0.11.11
@@ -2018,9 +2043,13 @@ libtelepathy-glib.so.0 libtelepathy-glib0 #MINVER#
  tp_simple_client_factory_ensure_channel at TELEPATHY_GLIB_0.15.5 0.15.5
  tp_simple_client_factory_ensure_connection at TELEPATHY_GLIB_0.15.5 0.15.5
  tp_simple_client_factory_ensure_contact at TELEPATHY_GLIB_0.15.5 0.15.5
+ tp_simple_client_factory_ensure_contact_by_id_async at TELEPATHY_GLIB_0.19.1 0.19.1
+ tp_simple_client_factory_ensure_contact_by_id_finish at TELEPATHY_GLIB_0.19.1 0.19.1
  tp_simple_client_factory_get_dbus_daemon at TELEPATHY_GLIB_0.15.5 0.15.5
  tp_simple_client_factory_get_type at TELEPATHY_GLIB_0.15.5 0.15.5
  tp_simple_client_factory_new at TELEPATHY_GLIB_0.15.5 0.15.5
+ tp_simple_client_factory_upgrade_contacts_async at TELEPATHY_GLIB_0.19.1 0.19.1
+ tp_simple_client_factory_upgrade_contacts_finish at TELEPATHY_GLIB_0.19.1 0.19.1
  tp_simple_handler_get_type at TELEPATHY_GLIB_0.11.6 0.11.6
  tp_simple_handler_new at TELEPATHY_GLIB_0.11.6 0.11.6
  tp_simple_handler_new_with_am at TELEPATHY_GLIB_0.11.14 0.11.14
diff --git a/debian/patches/Hide-GList-based-contact-info-typedefs-from-g-ir-sca.patch b/debian/patches/Hide-GList-based-contact-info-typedefs-from-g-ir-sca.patch
deleted file mode 100644
index 04717fa..0000000
--- a/debian/patches/Hide-GList-based-contact-info-typedefs-from-g-ir-sca.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From d4abcf3999ee5141805ab70bf925983b336d49f3 Mon Sep 17 00:00:00 2001
-From: Simon McVittie <simon.mcvittie at collabora.co.uk>
-Date: Fri, 11 May 2012 16:49:56 +0100
-Subject: [PATCH] Hide GList-based contact info typedefs from g-ir-scanner
-
-Recent vapigen versions don't like the result.
-
-This means we can revert the version that adds stub doc-comments for
-them, which seems to confuse gtk-doc. Good thing we don't have several
-duelling C-and-comment parsers or anything...
-
-Bug: https://bugs.freedesktop.org/show_bug.cgi?id=49637
-Signed-off-by: Simon McVittie <simon.mcvittie at collabora.co.uk>
-Reviewed-by: Xavier Claessens <xavier.claessens at collabora.co.uk>
----
- telepathy-glib/connection.h              |    8 ++++++++
- 2 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/telepathy-glib/connection.h b/telepathy-glib/connection.h
-index 04506c0..b5af72b 100644
---- a/telepathy-glib/connection.h
-+++ b/telepathy-glib/connection.h
-@@ -48,7 +48,11 @@ TpContactInfoFieldSpec *tp_contact_info_field_spec_copy (
-     const TpContactInfoFieldSpec *self);
- void tp_contact_info_field_spec_free (TpContactInfoFieldSpec *self);
- 
-+#ifndef __GI_SCANNER__
-+/* the typedef only exists for G_DEFINE_BOXED_TYPE's benefit, and
-+ * g-ir-scanner 1.32.1 doesn't parse a skip annotation */
- typedef GList TpContactInfoSpecList;
-+#endif
- 
- #define TP_TYPE_CONTACT_INFO_SPEC_LIST (tp_contact_info_spec_list_get_type ())
- GType tp_contact_info_spec_list_get_type (void);
-@@ -73,7 +77,11 @@ TpContactInfoField *tp_contact_info_field_new (const gchar *field_name,
- TpContactInfoField *tp_contact_info_field_copy (const TpContactInfoField *self);
- void tp_contact_info_field_free (TpContactInfoField *self);
- 
-+#ifndef __GI_SCANNER__
-+/* the typedef only exists for G_DEFINE_BOXED_TYPE's benefit, and
-+ * g-ir-scanner 1.32.1 doesn't parse a skip annotation */
- typedef GList TpContactInfoList;
-+#endif
- 
- #define TP_TYPE_CONTACT_INFO_LIST (tp_contact_info_list_get_type ())
- GType tp_contact_info_list_get_type (void);
--- 
-1.7.10
-
diff --git a/debian/patches/series b/debian/patches/series
index 1f3f1b2..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-Hide-GList-based-contact-info-typedefs-from-g-ir-sca.patch

-- 
telepathy-glib packaging



More information about the Pkg-telepathy-commits mailing list