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

[Simon McVittie]

The following commit has been merged in the debian-experimental branch:
commit d8f3f5ba72dbffc9e8577117c85d94be31e95b04
Author: Simon McVittie <smcv at debian.org>
Date:   Thu Apr 12 13:15:31 2012 +0100

    Don't limit the runtime of the tests, and rely on sbuild (or whatever) to terminate the build if they get stuck. (Closes: #646076, and allows dropping the "temporary" Ubuntu patch which has worked around LP#804978 for several months)

diff --git a/debian/changelog b/debian/changelog
index b02e211..5ec944c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,10 @@ telepathy-glib (0.18.0-2) UNRELEASED; urgency=low
   * Use the debhelper "gir" sequence from gobject-introspection
   * Allow parallel builds
   * Standards-Version: 3.9.3 (no changes)
+  * Don't limit the runtime of the tests, and rely on sbuild (or whatever)
+    to terminate the build if they get stuck. (Closes: #646076, and allows
+    dropping the "temporary" Ubuntu patch which has worked around
+    LP#804978 for several months)
 
   [ Laurent Bigonville ]
   * debian/control:
diff --git a/debian/rules b/debian/rules
index b897e95..7e27ea0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,6 +23,12 @@ override_dh_auto_configure:
 
 export DPKG_GENSYMBOLS_CHECK_LEVEL = 4
 
+# The tests try to exit after a reasonable time, but some architectures
+# are unreasonably slow, and Ubuntu buildds have output buffering issues.
+# Debian buildds know how to abort a stalled build after a while anyway,
+# so the individual tests don't need to worry about it.
+export TP_TESTS_NO_TIMEOUT = 1
+
 override_dh_install:
 	dh_install --list-missing
 

-- 
telepathy-glib packaging