[Pkg-telepathy-commits] [SCM] telepathy-glib packaging branch, debian-experimental, updated. debian/0.16.1-1-3-gcab8998
Jonny Lamb
jonny at debian.org
Wed Nov 9 14:26:31 UTC 2011
The following commit has been merged in the debian-experimental branch:
commit 5876bfbc126ffb6af96544de42105cfddc209d83
Author: Jonny Lamb <jonny at debian.org>
Date: Tue Jul 12 15:56:16 2011 +0100
debian/patches/: Drop all patches as they're all upstream now.
diff --git a/debian/changelog b/debian/changelog
index 8e2e658..c1dd698 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
telepathy-glib (0.15.3-1) UNRELEASED; urgency=low
* New upstream release.
+ * debian/patches/: Drop all patches as they're all upstream now.
- -- Jonny Lamb <jonny at debian.org> Tue, 12 Jul 2011 15:47:56 +0100
+ -- Jonny Lamb <jonny at debian.org> Tue, 12 Jul 2011 15:55:52 +0100
telepathy-glib (0.15.2-4) unstable; urgency=low
diff --git a/debian/patches/0001-Skip-stream-tube-credentials-passing-tests-where-uns.patch b/debian/patches/0001-Skip-stream-tube-credentials-passing-tests-where-uns.patch
deleted file mode 100644
index d16bc6a..0000000
--- a/debian/patches/0001-Skip-stream-tube-credentials-passing-tests-where-uns.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From: Simon McVittie <simon.mcvittie at collabora.co.uk>
-Date: Fri, 1 Jul 2011 00:26:15 +0100
-Subject: [PATCH] Skip stream tube credentials-passing tests where unsupported
-
-Bug: https://bugs.freedesktop.org/show_bug.cgi?id=36801
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=623587
-Reviewed-by: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
-Applied-upstream: 0.14.9, 0.15.3, commit:f085405f
----
- tests/dbus/stream-tube.c | 35 +++++++++++++++++++++++++++++++++++
- 1 files changed, 35 insertions(+), 0 deletions(-)
-
-diff --git a/tests/dbus/stream-tube.c b/tests/dbus/stream-tube.c
-index 534bdc4..c72cfc8 100644
---- a/tests/dbus/stream-tube.c
-+++ b/tests/dbus/stream-tube.c
-@@ -18,6 +18,10 @@
- #include "tests/lib/simple-conn.h"
- #include "tests/lib/stream-tube-chan.h"
-
-+#ifdef HAVE_GIO_UNIX
-+# include <gio/gio.h>
-+#endif
-+
- #define BUFFER_SIZE 128
-
- typedef struct {
-@@ -44,6 +48,7 @@ TestContext contexts[] = {
- };
-
- static gboolean have_ipv6 = FALSE;
-+static gboolean have_creds = FALSE;
-
- typedef struct {
- GMainLoop *mainloop;
-@@ -411,6 +416,14 @@ test_accept_success (Test *test,
- guint i = GPOINTER_TO_UINT (data);
- TpContact *contact;
-
-+ if (contexts[i].address_type == TP_SOCKET_ADDRESS_TYPE_UNIX &&
-+ contexts[i].access_control == TP_SOCKET_ACCESS_CONTROL_CREDENTIALS &&
-+ !have_creds)
-+ {
-+ g_message ("skipped: credentials-passing not supported here");
-+ return;
-+ }
-+
- if (contexts[i].address_type == TP_SOCKET_ADDRESS_TYPE_IPV6 &&
- !have_ipv6)
- {
-@@ -518,6 +531,14 @@ test_offer_success (Test *test,
- TpHandle bob_handle;
- TpContact *contact;
-
-+ if (contexts[i].address_type == TP_SOCKET_ADDRESS_TYPE_UNIX &&
-+ contexts[i].access_control == TP_SOCKET_ACCESS_CONTROL_CREDENTIALS &&
-+ !have_creds)
-+ {
-+ g_message ("skipped: credentials-passing not supported here");
-+ return;
-+ }
-+
- if (contexts[i].address_type == TP_SOCKET_ADDRESS_TYPE_IPV6 &&
- !have_ipv6)
- {
-@@ -714,6 +735,14 @@ test_offer_race (Test *test,
- GSocketConnection *conn;
- TpContact *contact;
-
-+ if (contexts[i].address_type == TP_SOCKET_ADDRESS_TYPE_UNIX &&
-+ contexts[i].access_control == TP_SOCKET_ACCESS_CONTROL_CREDENTIALS &&
-+ !have_creds)
-+ {
-+ g_message ("skipped: credentials-passing not supported here");
-+ return;
-+ }
-+
- if (contexts[i].address_type == TP_SOCKET_ADDRESS_TYPE_IPV6 &&
- !have_ipv6)
- {
-@@ -1023,6 +1052,12 @@ main (int argc,
-
- have_ipv6 = check_ipv6_support ();
-
-+#ifdef HAVE_GIO_UNIX
-+ have_creds = g_unix_credentials_message_is_supported ();
-+#else
-+ have_creds = FALSE;
-+#endif
-+
- g_test_add ("/stream-tube/creation", Test, NULL, setup, test_creation,
- teardown);
- g_test_add ("/stream-tube/properties", Test, NULL, setup, test_properties,
diff --git a/debian/patches/contact-lists-test-timeout.patch b/debian/patches/contact-lists-test-timeout.patch
deleted file mode 100644
index 6b825e7..0000000
--- a/debian/patches/contact-lists-test-timeout.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: Adam Conrad <adconrad at 0c3.net>
-Date: Wed, 22 Jun 2011 16:16:04 -0600
-Subject: [PATCH] Jack the timeout of the dbus/contact-lists test, so it no
- longer fails on slow architectures like arm and mips.
-
-Origin: upstream, http://cgit.freedesktop.org/telepathy/telepathy-glib/patch/?id=6152cfdcbd35509c5207ef337acca2f47a807c5b
-Applied-upstream: 0.15.3
----
- tests/dbus/contact-lists.c | 6 +++++-
- 1 files changed, 5 insertions(+), 1 deletions(-)
-
-diff --git a/tests/dbus/contact-lists.c b/tests/dbus/contact-lists.c
-index 0284467..6dce762 100644
---- a/tests/dbus/contact-lists.c
-+++ b/tests/dbus/contact-lists.c
-@@ -2624,7 +2624,11 @@ int
- main (int argc,
- char **argv)
- {
-- tp_tests_init (&argc, &argv);
-+ g_type_init ();
-+ tp_tests_abort_after (30);
-+ tp_debug_set_flags ("all");
-+
-+ g_test_init (&argc, &argv, NULL);
-
- g_test_add ("/contact-lists/nothing",
- Test, NULL, setup, test_nothing, teardown);
diff --git a/debian/patches/fix-ftbfs-ia64.patch b/debian/patches/fix-ftbfs-ia64.patch
deleted file mode 100644
index 8514dd2..0000000
--- a/debian/patches/fix-ftbfs-ia64.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 9bdfecb9e1ade99d1b86aedea87f6782ecfde283 Mon Sep 17 00:00:00 2001
-From: Emilio Pozuelo Monfort <emilio.pozuelo at collabora.co.uk>
-Date: Tue, 05 Jul 2011 17:13:23 +0000
-Subject: Properly convert the GType with GSIZE_TO_POINTER
-
-This caused the test to fail on IA64.
-
-https://bugs.freedesktop.org/show_bug.cgi?id=38980
----
-diff --git a/tests/dbus/connection-balance.c b/tests/dbus/connection-balance.c
-index 34d679b..4629cb1 100644
---- a/tests/dbus/connection-balance.c
-+++ b/tests/dbus/connection-balance.c
-@@ -223,7 +223,7 @@ setup (Test *test,
- {
- GError *error = NULL;
- GQuark features[] = { TP_CONNECTION_FEATURE_CONNECTED, 0 };
-- GType conn_type = GPOINTER_TO_UINT (data);
-+ GType conn_type = GPOINTER_TO_SIZE (data);
-
- g_type_init ();
- tp_debug_set_flags ("all");
-@@ -415,13 +415,13 @@ main (int argc,
- g_test_init (&argc, &argv, NULL);
-
- g_test_add ("/conn/balance", Test,
-- GUINT_TO_POINTER (TYPE_BALANCED_CONNECTION),
-+ GSIZE_TO_POINTER (TYPE_BALANCED_CONNECTION),
- setup, test_balance, teardown);
- g_test_add ("/conn/balance-unknown", Test,
-- GUINT_TO_POINTER (TYPE_UNBALANCED_CONNECTION),
-+ GSIZE_TO_POINTER (TYPE_UNBALANCED_CONNECTION),
- setup, test_balance_unknown, teardown);
- g_test_add ("/conn/balance-unimplemented", Test,
-- GUINT_TO_POINTER (TP_TESTS_TYPE_SIMPLE_CONNECTION),
-+ GSIZE_TO_POINTER (TP_TESTS_TYPE_SIMPLE_CONNECTION),
- setup, test_balance_unknown, teardown);
-
- return g_test_run ();
---
-cgit v0.9
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 1363fcc..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,3 +0,0 @@
-contact-lists-test-timeout.patch
-0001-Skip-stream-tube-credentials-passing-tests-where-uns.patch
-fix-ftbfs-ia64.patch
--
telepathy-glib packaging
More information about the Pkg-telepathy-commits
mailing list