[Pkg-apache-commits] [SCM] Debian packaging for the apr (Apache Portable Runtime) package branch, master, updated. 63d7300cd2cff1141bc91b91a83a36e367628c7f

[Stefan Fritsch]

The following commit has been merged in the master branch:
commit daf4827196baf04f051031de52a1e74ae36e64a4
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Mon May 28 13:10:55 2012 +0200

    Add some debug output in order to debug test failures on kfreebsd-i386.

diff --git a/debian/changelog b/debian/changelog
index c50944f..8626aa9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+apr (1.4.6-3) UNRELEASED; urgency=low
+
+  * Add some debug output in order to debug test failures on kfreebsd-i386.
+
+ -- Stefan Fritsch <sf at debian.org>  Mon, 28 May 2012 13:10:04 +0200
+
 apr (1.4.6-2) unstable; urgency=low
 
   * Enable use of some new APIs. The minimal required linux kernel version is
diff --git a/debian/patches/debug-kfreebsd-issues.patch b/debian/patches/debug-kfreebsd-issues.patch
new file mode 100644
index 0000000..9a870d2
--- /dev/null
+++ b/debian/patches/debug-kfreebsd-issues.patch
@@ -0,0 +1,13 @@
+Add debug output because of test failures causing FTBFS on kfreebsd-i386
+Index: apr/test/testlock.c
+===================================================================
+--- apr.orig/test/testlock.c	2012-05-28 13:08:20.394496385 +0200
++++ apr/test/testlock.c	2012-05-28 13:09:00.902494363 +0200
+@@ -297,6 +297,7 @@
+             continue;
+         }
+         ABTS_INT_EQUAL(tc, 1, APR_STATUS_IS_TIMEUP(s));
++        printf("Timer returned %dms late\n", (int)(end - begin - timeout)/1000);
+         ABTS_ASSERT(tc, "Timer returned too late", end - begin - timeout < 100000);
+         break;
+     }
diff --git a/debian/patches/series b/debian/patches/series
index f4058ce..7626fe3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@ fix_doxygen.patch
 omit_extra_libs.patch
 hurd_shm_flock.patch
 hurd_fix-hints.patch
+debug-kfreebsd-issues.patch

-- 
Debian packaging for the apr (Apache Portable Runtime) package