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

Simon McVittie smcv at debian.org
Fri Sep 14 11:45:17 UTC 2012


The following commit has been merged in the debian-experimental branch:
commit 41fcba680ab53b28e7c8c2764c8395c171774a89
Author: Simon McVittie <smcv at debian.org>
Date:   Fri Sep 14 12:20:32 2012 +0100

    New upstream release
    
    - remove all patches, applied upstream
    - update symbols file

diff --git a/debian/changelog b/debian/changelog
index 2340ac1..79f1e72 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+telepathy-glib (0.19.9-1) experimental; urgency=low
+
+  * New upstream release
+    - remove all patches, applied upstream
+    - update symbols file
+
+ -- Simon McVittie <smcv at debian.org>  Fri, 14 Sep 2012 12:20:24 +0100
+
 telepathy-glib (0.19.8-2) experimental; urgency=low
 
   * debian/patches/Fix-incorrect-error-on-UpdateLocalMediaDescription.patch:
diff --git a/debian/libtelepathy-glib0.symbols b/debian/libtelepathy-glib0.symbols
index aeb542a..a88885d 100644
--- a/debian/libtelepathy-glib0.symbols
+++ b/debian/libtelepathy-glib0.symbols
@@ -51,12 +51,13 @@ libtelepathy-glib.so.0 libtelepathy-glib0 #MINVER#
  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.19.2 at TELEPATHY_GLIB_0.19.2 0.19.3
+ TELEPATHY_GLIB_0.19.2 at TELEPATHY_GLIB_0.19.2 0.19.2
  TELEPATHY_GLIB_0.19.3 at TELEPATHY_GLIB_0.19.3 0.19.3
- TELEPATHY_GLIB_0.19.4 at TELEPATHY_GLIB_0.19.4 0.19.6
+ TELEPATHY_GLIB_0.19.4 at TELEPATHY_GLIB_0.19.4 0.19.4
  TELEPATHY_GLIB_0.19.6 at TELEPATHY_GLIB_0.19.6 0.19.6
  TELEPATHY_GLIB_0.19.7 at TELEPATHY_GLIB_0.19.7 0.19.7
  TELEPATHY_GLIB_0.19.8 at TELEPATHY_GLIB_0.19.8 0.19.8
+ TELEPATHY_GLIB_0.19.9 at TELEPATHY_GLIB_0.19.9 0.19.9
  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
@@ -176,6 +177,7 @@ libtelepathy-glib.so.0 libtelepathy-glib0 #MINVER#
  tp_account_manager_create_account_async at TELEPATHY_GLIB_0.9.0 0.9.0
  tp_account_manager_create_account_finish at TELEPATHY_GLIB_0.9.0 0.9.0
  tp_account_manager_dup at TELEPATHY_GLIB_0.9.0 0.9.0
+ tp_account_manager_dup_valid_accounts at TELEPATHY_GLIB_0.19.9 0.19.9
  tp_account_manager_enable_restart at TELEPATHY_GLIB_0.9.0 0.9.0
  tp_account_manager_ensure_account at TELEPATHY_GLIB_0.9.0 0.9.0
  tp_account_manager_get_feature_quark_core at TELEPATHY_GLIB_0.9.0 0.9.0
@@ -217,7 +219,7 @@ libtelepathy-glib.so.0 libtelepathy-glib0 #MINVER#
  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_set_storage_provider at TELEPATHY_GLIB_0.19.4 0.19.6
+ tp_account_request_set_storage_provider at TELEPATHY_GLIB_0.19.4 0.19.4
  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
@@ -349,6 +351,8 @@ libtelepathy-glib.so.0 libtelepathy-glib0 #MINVER#
  tp_base_client_be_a_handler at TELEPATHY_GLIB_0.11.6 0.11.6
  tp_base_client_delegate_channels_async at TELEPATHY_GLIB_0.15.0 0.15.0
  tp_base_client_delegate_channels_finish at TELEPATHY_GLIB_0.15.0 0.15.0
+ tp_base_client_dup_handled_channels at TELEPATHY_GLIB_0.19.9 0.19.9
+ tp_base_client_dup_pending_requests at TELEPATHY_GLIB_0.19.9 0.19.9
  tp_base_client_get_account_manager at TELEPATHY_GLIB_0.11.14 0.11.14
  tp_base_client_get_bus_name at TELEPATHY_GLIB_0.11.5 0.11.5
  tp_base_client_get_channel_factory at TELEPATHY_GLIB_0.13.2 0.13.2
@@ -617,7 +621,11 @@ libtelepathy-glib.so.0 libtelepathy-glib0 #MINVER#
  tp_channel_dispatch_operation_close_channels_finish at TELEPATHY_GLIB_0.15.1 0.15.1
  tp_channel_dispatch_operation_destroy_channels_async at TELEPATHY_GLIB_0.15.2 0.15.2
  tp_channel_dispatch_operation_destroy_channels_finish at TELEPATHY_GLIB_0.15.2 0.15.2
+ tp_channel_dispatch_operation_get_account at TELEPATHY_GLIB_0.19.9 0.19.9
+ tp_channel_dispatch_operation_get_channels at TELEPATHY_GLIB_0.19.9 0.19.9
+ tp_channel_dispatch_operation_get_connection at TELEPATHY_GLIB_0.19.9 0.19.9
  tp_channel_dispatch_operation_get_feature_quark_core at TELEPATHY_GLIB_0.11.5 0.11.5
+ tp_channel_dispatch_operation_get_possible_handlers at TELEPATHY_GLIB_0.19.9 0.19.9
  tp_channel_dispatch_operation_get_type at TELEPATHY_GLIB_0.7.32 0.7.32
  tp_channel_dispatch_operation_handle_with_async at TELEPATHY_GLIB_0.11.5 0.11.5
  tp_channel_dispatch_operation_handle_with_finish at TELEPATHY_GLIB_0.11.5 0.11.5
@@ -632,6 +640,7 @@ libtelepathy-glib.so.0 libtelepathy-glib0 #MINVER#
  tp_channel_dispatcher_new at TELEPATHY_GLIB_0.7.32 0.7.32
  tp_channel_dispatcher_present_channel_async at TELEPATHY_GLIB_0.15.0 0.15.0
  tp_channel_dispatcher_present_channel_finish at TELEPATHY_GLIB_0.15.0 0.15.0
+ tp_channel_dup_immutable_properties at TELEPATHY_GLIB_0.19.9 0.19.9
  tp_channel_factory_iface_close_all at TELEPATHY_GLIB_0.7.0 0.7.1
  tp_channel_factory_iface_connected at TELEPATHY_GLIB_0.7.0 0.7.1
  tp_channel_factory_iface_connecting at TELEPATHY_GLIB_0.7.0 0.7.1
@@ -644,6 +653,7 @@ libtelepathy-glib.so.0 libtelepathy-glib0 #MINVER#
  tp_channel_get_channel_type at TELEPATHY_GLIB_0.7.12 0.7.12
  tp_channel_get_channel_type_id at TELEPATHY_GLIB_0.7.12 0.7.12
  tp_channel_get_chat_state at TELEPATHY_GLIB_0.11.3 0.11.3
+ tp_channel_get_connection at TELEPATHY_GLIB_0.19.9 0.19.9
  tp_channel_get_feature_quark_chat_states at TELEPATHY_GLIB_0.11.3 0.11.3
  tp_channel_get_feature_quark_contacts at TELEPATHY_GLIB_0.15.6 0.15.6
  tp_channel_get_feature_quark_core at TELEPATHY_GLIB_0.11.3 0.11.3
@@ -1327,6 +1337,7 @@ libtelepathy-glib.so.0 libtelepathy-glib0 #MINVER#
  tp_connection_dup_contact_by_id_async at TELEPATHY_GLIB_0.19.0 0.19.0
  tp_connection_dup_contact_by_id_finish at TELEPATHY_GLIB_0.19.0 0.19.0
  tp_connection_dup_contact_if_possible at TELEPATHY_GLIB_0.13.9 0.13.9
+ tp_connection_dup_contact_info_supported_fields at TELEPATHY_GLIB_0.19.9 0.19.9
  tp_connection_dup_contact_list at TELEPATHY_GLIB_0.15.5 0.15.5
  tp_connection_dup_detailed_error_vardict at TELEPATHY_GLIB_0.19.0 0.19.0
  tp_connection_get_account at TELEPATHY_GLIB_0.15.5 0.15.5
@@ -1442,6 +1453,7 @@ libtelepathy-glib.so.0 libtelepathy-glib0 #MINVER#
  tp_contact_authorize_publication_finish at TELEPATHY_GLIB_0.15.5 0.15.5
  tp_contact_block_async at TELEPATHY_GLIB_0.17.0 0.17.0
  tp_contact_block_finish at TELEPATHY_GLIB_0.17.0 0.17.0
+ tp_contact_dup_contact_info at TELEPATHY_GLIB_0.19.9 0.19.9
  tp_contact_feature_get_type at TELEPATHY_GLIB_0.11.5 0.11.5
  tp_contact_get_account at TELEPATHY_GLIB_0.19.0 0.19.0
  tp_contact_get_alias at TELEPATHY_GLIB_0.7.18 0.7.18
@@ -1496,6 +1508,7 @@ libtelepathy-glib.so.0 libtelepathy-glib0 #MINVER#
  tp_contact_search_new_finish at TELEPATHY_GLIB_0.13.11 0.13.11
  tp_contact_search_reset_async at TELEPATHY_GLIB_0.13.11 0.13.11
  tp_contact_search_reset_finish at TELEPATHY_GLIB_0.13.11 0.13.11
+ tp_contact_search_result_dup_fields at TELEPATHY_GLIB_0.19.9 0.19.9
  tp_contact_search_result_get_field at TELEPATHY_GLIB_0.13.11 0.13.11
  tp_contact_search_result_get_fields at TELEPATHY_GLIB_0.13.11 0.13.11
  tp_contact_search_result_get_identifier at TELEPATHY_GLIB_0.13.11 0.13.11
@@ -1597,7 +1610,7 @@ libtelepathy-glib.so.0 libtelepathy-glib0 #MINVER#
  tp_dtmf_player_play at TELEPATHY_GLIB_0.13.3 0.13.3
  tp_dynamic_handle_repo_get_type at TELEPATHY_GLIB_0.7.0 0.7.1
  tp_dynamic_handle_repo_lookup_exact at TELEPATHY_GLIB_0.7.0 0.7.1
- tp_dynamic_handle_repo_set_normalize_async at TELEPATHY_GLIB_0.19.2 0.19.3
+ tp_dynamic_handle_repo_set_normalize_async at TELEPATHY_GLIB_0.19.2 0.19.2
  tp_error_get_dbus_name at TELEPATHY_GLIB_0.7.31 0.7.31
  tp_error_get_type at TELEPATHY_GLIB_0.7.0 0.7.1
  tp_error_quark at TELEPATHY_GLIB_0.11.13 0.11.13
@@ -1695,8 +1708,8 @@ libtelepathy-glib.so.0 libtelepathy-glib0 #MINVER#
  tp_handle_client_hold at TELEPATHY_GLIB_0.7.0 0.7.1
  tp_handle_client_release at TELEPATHY_GLIB_0.7.0 0.7.1
  tp_handle_ensure at TELEPATHY_GLIB_0.7.0 0.7.1
- tp_handle_ensure_async at TELEPATHY_GLIB_0.19.2 0.19.3
- tp_handle_ensure_finish at TELEPATHY_GLIB_0.19.2 0.19.3
+ tp_handle_ensure_async at TELEPATHY_GLIB_0.19.2 0.19.2
+ tp_handle_ensure_finish at TELEPATHY_GLIB_0.19.2 0.19.2
  tp_handle_get_qdata at TELEPATHY_GLIB_0.7.0 0.7.1
  tp_handle_inspect at TELEPATHY_GLIB_0.7.0 0.7.1
  tp_handle_is_valid at TELEPATHY_GLIB_0.7.0 0.7.1
@@ -1998,6 +2011,7 @@ libtelepathy-glib.so.0 libtelepathy-glib0 #MINVER#
  tp_proxy_get_dbus_connection at TELEPATHY_GLIB_0.7.17 0.7.17
  tp_proxy_get_dbus_daemon at TELEPATHY_GLIB_0.7.17 0.7.17
  tp_proxy_get_factory at TELEPATHY_GLIB_0.15.5 0.15.5
+ tp_proxy_get_interface_by_id at TELEPATHY_GLIB_0.19.9 0.19.9
  tp_proxy_get_invalidated at TELEPATHY_GLIB_0.7.17 0.7.17
  tp_proxy_get_object_path at TELEPATHY_GLIB_0.7.17 0.7.17
  tp_proxy_get_type at TELEPATHY_GLIB_0.7.1 0.7.1
@@ -2583,6 +2597,7 @@ libtelepathy-glib.so.0 libtelepathy-glib0 #MINVER#
  tp_text_channel_ack_message_finish at TELEPATHY_GLIB_0.13.10 0.13.10
  tp_text_channel_ack_messages_async at TELEPATHY_GLIB_0.13.10 0.13.10
  tp_text_channel_ack_messages_finish at TELEPATHY_GLIB_0.13.10 0.13.10
+ tp_text_channel_dup_pending_messages at TELEPATHY_GLIB_0.19.9 0.19.9
  tp_text_channel_get_chat_state at TELEPATHY_GLIB_0.19.0 0.19.0
  tp_text_channel_get_delivery_reporting_support at TELEPATHY_GLIB_0.13.10 0.13.10
  tp_text_channel_get_feature_quark_chat_states at TELEPATHY_GLIB_0.19.0 0.19.0
diff --git a/debian/patches/0001-tls-certificate-test-GBytes-aren-t-0-terminated.patch b/debian/patches/0001-tls-certificate-test-GBytes-aren-t-0-terminated.patch
deleted file mode 100644
index 05cb00d..0000000
--- a/debian/patches/0001-tls-certificate-test-GBytes-aren-t-0-terminated.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 8c682d0122b066ad69cc7106884f383563c2ba6d Mon Sep 17 00:00:00 2001
-From: Sjoerd Simons <sjoerd.simons at collabora.co.uk>
-Date: Fri, 31 Aug 2012 15:33:08 +0200
-Subject: [PATCH] tls-certificate test: GBytes aren't 0 terminated
-
----
- tests/dbus/tls-certificate.c |    2 +-
- tests/lib/util.c             |   20 ++++++++++++++++++++
- tests/lib/util.h             |    6 ++++++
- 3 files changed, 27 insertions(+), 1 deletion(-)
-
-diff --git a/tests/dbus/tls-certificate.c b/tests/dbus/tls-certificate.c
-index 752ea6d..ee67ff2 100644
---- a/tests/dbus/tls-certificate.c
-+++ b/tests/dbus/tls-certificate.c
-@@ -160,7 +160,7 @@ test_core (Test *test,
-   g_assert (cert_data != NULL);
-   g_assert_cmpuint (cert_data->len, ==, 1);
-   d = g_ptr_array_index (cert_data, 0);
--  g_assert_cmpstr (g_bytes_get_data (d, NULL), ==, "BADGER");
-+  tp_tests_assert_bytes_equals (d, "BADGER", 6);
- }
- 
- static void
-diff --git a/tests/lib/util.c b/tests/lib/util.c
-index 21d3855..9510cb0 100644
---- a/tests/lib/util.c
-+++ b/tests/lib/util.c
-@@ -176,6 +176,26 @@ _tp_tests_assert_strv_equals (const char *file,
- }
- 
- void
-+_tp_tests_assert_bytes_equal (const gchar *file, int line,
-+  GBytes *actual, gconstpointer expected_data,
-+  gsize expected_length)
-+{
-+  if (expected_length != g_bytes_get_size (actual))
-+    {
-+      g_error ("%s:%d: assertion failed: expected %"G_GSIZE_FORMAT
-+         " bytes, got %"G_GSIZE_FORMAT,
-+        file, line, expected_length, g_bytes_get_size (actual));
-+    }
-+  else if (memcmp (g_bytes_get_data (actual, NULL),
-+      expected_data, expected_length) != 0)
-+    {
-+      g_error (
-+        "%s:%d: assertion failed: expected data didn't match the actual data",
-+        file, line);
-+    }
-+}
-+
-+void
- tp_tests_create_conn (GType conn_type,
-     const gchar *account,
-     gboolean connect,
-diff --git a/tests/lib/util.h b/tests/lib/util.h
-index d58138e..ce19d66 100644
---- a/tests/lib/util.h
-+++ b/tests/lib/util.h
-@@ -36,6 +36,12 @@ void _tp_tests_assert_strv_equals (const char *file, int line,
-   const char *actual_desc, gconstpointer actual_strv,
-   const char *expected_desc, gconstpointer expected_strv);
- 
-+#define tp_tests_assert_bytes_equals(actual, expected, expected_length) \
-+  _tp_tests_assert_bytes_equal (__FILE__, __LINE__, \
-+      actual, expected, expected_length)
-+void _tp_tests_assert_bytes_equal (const gchar *file, int line,
-+  GBytes *actual, gconstpointer expected_data, gsize expected_length);
-+
- void tp_tests_create_conn (GType conn_type,
-     const gchar *account,
-     gboolean connect,
--- 
-1.7.10.4
-
diff --git a/debian/patches/Fix-incorrect-error-on-UpdateLocalMediaDescription.patch b/debian/patches/Fix-incorrect-error-on-UpdateLocalMediaDescription.patch
deleted file mode 100644
index 56bf07d..0000000
--- a/debian/patches/Fix-incorrect-error-on-UpdateLocalMediaDescription.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 680a5dd2a492078a0cc497502aab1d81cdba39ac Mon Sep 17 00:00:00 2001
-From: Sjoerd Simons <sjoerd.simons at collabora.co.uk>
-Date: Mon, 3 Sep 2012 11:10:01 +0200
-Subject: [PATCH 1/2] Fix incorrect error on UpdateLocalMediaDescription
-
-Remove the code that errors out a local description update if there is
-*any* outstanding offer. A bit later in the same function a proper check
-is done to see if there is a offer for the update contact, which is
-correct.
----
- telepathy-glib/base-media-call-content.c |    8 --------
- 1 file changed, 8 deletions(-)
-
-diff --git a/telepathy-glib/base-media-call-content.c b/telepathy-glib/base-media-call-content.c
-index a0032f4..b7cf8e1 100644
---- a/telepathy-glib/base-media-call-content.c
-+++ b/telepathy-glib/base-media-call-content.c
-@@ -683,14 +683,6 @@ tp_base_media_call_content_update_local_media_description (
-   GPtrArray *codecs;
-   gpointer contact;
- 
--  if (self->priv->current_offer != NULL)
--    {
--      GError error = { TP_ERROR, TP_ERROR_NOT_AVAILABLE,
--          "There is a media description offer around so "
--          "UpdateMediaDescription shouldn't be called." };
--      dbus_g_method_return_error (context, &error);
--      return;
--    }
- 
-   if (!g_hash_table_lookup_extended (properties,
-           TP_PROP_CALL_CONTENT_MEDIA_DESCRIPTION_REMOTE_CONTACT,
--- 
-1.7.10.4
-
diff --git a/debian/patches/Fix-retrieving-the-remove-contact-from-a-MediaDescri.patch b/debian/patches/Fix-retrieving-the-remove-contact-from-a-MediaDescri.patch
deleted file mode 100644
index 564c811..0000000
--- a/debian/patches/Fix-retrieving-the-remove-contact-from-a-MediaDescri.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From a04137272f0468fc1f4904280a02633cea60c998 Mon Sep 17 00:00:00 2001
-From: Sjoerd Simons <sjoerd.simons at collabora.co.uk>
-Date: Mon, 3 Sep 2012 11:14:34 +0200
-Subject: [PATCH 2/2] Fix retrieving the remove contact from a
- MediaDescription hash
-
-Correctly get the remote contact handle out of the MediaDescription
-hash, it's an a{sv} not string => uint32.
-
-Reviewed-by: Simon McVittie <simon.mcvittie at collabora.co.uk>
-Bug: https://bugs.freedesktop.org/show_bug.cgi?id=54425
----
- telepathy-glib/base-media-call-content.c |   15 ++++++++-------
- 1 file changed, 8 insertions(+), 7 deletions(-)
-
-diff --git a/telepathy-glib/base-media-call-content.c b/telepathy-glib/base-media-call-content.c
-index b7cf8e1..6256c06 100644
---- a/telepathy-glib/base-media-call-content.c
-+++ b/telepathy-glib/base-media-call-content.c
-@@ -681,12 +681,13 @@ tp_base_media_call_content_update_local_media_description (
-   TpBaseMediaCallContent *self = TP_BASE_MEDIA_CALL_CONTENT (iface);
-   GHashTable *current_properties;
-   GPtrArray *codecs;
--  gpointer contact;
-+  TpHandle contact;
-+  gboolean valid;
- 
-+  contact = tp_asv_get_uint32 (properties,
-+      TP_PROP_CALL_CONTENT_MEDIA_DESCRIPTION_REMOTE_CONTACT, &valid);
- 
--  if (!g_hash_table_lookup_extended (properties,
--          TP_PROP_CALL_CONTENT_MEDIA_DESCRIPTION_REMOTE_CONTACT,
--          NULL, &contact))
-+  if (!valid)
-     {
-       GError error = { TP_ERROR, TP_ERROR_INVALID_ARGUMENT,
-           "The media description is missing the RemoteContact key." };
-@@ -696,7 +697,7 @@ tp_base_media_call_content_update_local_media_description (
- 
-   current_properties = g_hash_table_lookup (
-       self->priv->local_media_descriptions,
--      contact);
-+      GUINT_TO_POINTER (contact));
- 
-   if (current_properties == NULL)
-     {
-@@ -719,7 +720,7 @@ tp_base_media_call_content_update_local_media_description (
-     }
- 
-   if (self->priv->current_offer != NULL &&
--      tp_call_content_media_description_get_remote_contact (self->priv->current_offer) == GPOINTER_TO_UINT (contact))
-+      tp_call_content_media_description_get_remote_contact (self->priv->current_offer) == contact)
-     {
-       GError error = { TP_ERROR, TP_ERROR_NOT_AVAILABLE,
-                        "Can not update the media description while there is"
-@@ -728,7 +729,7 @@ tp_base_media_call_content_update_local_media_description (
-       return;
-     }
- 
--  set_local_properties (self, GPOINTER_TO_UINT (contact), properties);
-+  set_local_properties (self, contact, properties);
- 
-   tp_svc_call_content_interface_media_return_from_update_local_media_description
-       (context);
--- 
-1.7.10.4
-
diff --git a/debian/patches/series b/debian/patches/series
index 91d24d4..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +0,0 @@
-0001-tls-certificate-test-GBytes-aren-t-0-terminated.patch
-Fix-incorrect-error-on-UpdateLocalMediaDescription.patch
-Fix-retrieving-the-remove-contact-from-a-MediaDescri.patch

-- 
telepathy-glib packaging



More information about the Pkg-telepathy-commits mailing list