[SCM] gammaray packaging branch, master, updated. debian/2.1.0-2-5-g17981ab

[Felix Geyer]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/gammaray.git;a=commitdiff;h=28f828e

The following commit has been merged in the master branch:
commit 28f828e9d381bfedd0495e28d2ad781d49c91a3e
Author: Felix Geyer <fgeyer at debian.org>
Date:   Sun Jul 27 17:03:14 2014 +0200

    Make testsuite non-fatal on kfreebsd
    
    due to bug #570805: Wrong path in /proc/pid/maps when bind mounted.
---
 debian/changelog | 2 ++
 debian/rules     | 7 +++++++
 2 files changed, 9 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 671088f..c76f73b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ gammaray (2.1.0-3) UNRELEASED; urgency=medium
 
   [ Felix Geyer ]
   * Fix FTBFS on mips64 kernel, ppc64 and arm64.
+  * Make testsuite non-fatal on kfreebsd due to bug #570805:
+    Wrong path in /proc/pid/maps when bind mounted.
 
  -- Jakub Adam <jakub.adam at ktknet.cz>  Sat, 19 Jul 2014 13:58:03 +0200
 
diff --git a/debian/rules b/debian/rules
index b331fe2..71550ec 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,6 +4,8 @@
 
 export DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed
 
+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+
 %:
 	dh $@ --parallel
 
@@ -21,7 +23,12 @@ override_dh_auto_build:
 	dh_auto_build -B obj-qt4 -O--parallel
 
 override_dh_auto_test:
+# tests fail on kfreebsd because of bug #570805: Wrong path in /proc/pid/maps when bind mounted
+ifneq (,$(filter $(DEB_HOST_ARCH), kfreebsd-amd64 kfreebsd-i386))
+	xvfb-run -s "-screen 0 640x480x24" dh_auto_test -B obj-qt5 || true
+else
 	xvfb-run -s "-screen 0 640x480x24" dh_auto_test -B obj-qt5
+endif
 
 override_dh_auto_install:
 	dh_auto_install -B obj-qt5

-- 
gammaray packaging