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

[Simon McVittie]

The following commit has been merged in the debian-experimental branch:
commit 183d4cdf8d7932fd989d9e19e3eab130f3226e2e
Author: Simon McVittie <smcv at debian.org>
Date:   Fri Jul 1 10:30:46 2011 +0100

    Tag patches as applied upstream

diff --git a/debian/changelog b/debian/changelog
index 3945b58..57400b2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+telepathy-glib (0.15.2-4) UNRELEASED; urgency=low
+
+  * Tag patches as applied upstream
+
+ -- Simon McVittie <smcv at debian.org>  Fri, 01 Jul 2011 10:26:03 +0100
+
 telepathy-glib (0.15.2-3) unstable; urgency=low
 
   * Add patch to skip stream tube credentials-passing tests where that
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
index 017f7a5..d16bc6a 100644
--- 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
@@ -1,16 +1,17 @@
-From 7f2065f1f432c1d42c6475f0ce74a28af7c86556 Mon Sep 17 00:00:00 2001
 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 57c2dcf..e3410f2 100644
+index 534bdc4..c72cfc8 100644
 --- a/tests/dbus/stream-tube.c
 +++ b/tests/dbus/stream-tube.c
 @@ -18,6 +18,10 @@
@@ -77,7 +78,7 @@ index 57c2dcf..e3410f2 100644
    if (contexts[i].address_type == TP_SOCKET_ADDRESS_TYPE_IPV6 &&
        !have_ipv6)
      {
-@@ -1019,6 +1048,12 @@ main (int argc,
+@@ -1023,6 +1052,12 @@ main (int argc,
  
    have_ipv6 = check_ipv6_support ();
  
@@ -90,6 +91,3 @@ index 57c2dcf..e3410f2 100644
    g_test_add ("/stream-tube/creation", Test, NULL, setup, test_creation,
        teardown);
    g_test_add ("/stream-tube/properties", Test, NULL, setup, test_properties,
--- 
-1.7.5.4
-
diff --git a/debian/patches/contact-lists-test-timeout.patch b/debian/patches/contact-lists-test-timeout.patch
index 22a0b78..6b825e7 100644
--- a/debian/patches/contact-lists-test-timeout.patch
+++ b/debian/patches/contact-lists-test-timeout.patch
@@ -1,6 +1,14 @@
 From: Adam Conrad <adconrad at 0c3.net>
-Description: Bump the timeout of the contact-lists test for slower arches
+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

-- 
telepathy-glib packaging