[SCM] gammaray packaging branch, master, updated. debian/2.3.0-2-1-gd05b83a

[Felix Geyer]

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

The following commit has been merged in the master branch:
commit d05b83af1b254893649da63e2f9e5fc700ac9fa1
Author: Felix Geyer <fgeyer at debian.org>
Date:   Sat Aug 29 00:55:40 2015 +0200

    Disable attachtest-gdb on s390x. It's unstable and hangs builds.
---
 debian/changelog | 6 ++++++
 debian/rules     | 3 +++
 2 files changed, 9 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index d0e8f99..39b335a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+gammaray (2.3.0-3) unstable; urgency=medium
+
+  * Disable attachtest-gdb on s390x. It's unstable and hangs builds.
+
+ -- Felix Geyer <fgeyer at debian.org>  Sat, 29 Aug 2015 00:45:11 +0200
+
 gammaray (2.3.0-2) unstable; urgency=medium
 
   * Build-depend on libvtk6-qt-dev only on architectures where it's actually
diff --git a/debian/rules b/debian/rules
index 83c7a40..10ae42e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,6 +21,9 @@ 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 -a -s "-screen 0 640x480x24" dh_auto_test --max-parallel=1 -B obj-qt5 || true
+# attachtest-gdb is unstable on s90x and hangs builds
+else ifeq ($(DEB_HOST_ARCH), s390x)
+	xvfb-run -a -s "-screen 0 640x480x24" dh_auto_test --max-parallel=1 -B obj-qt5 -- ARGS="-E attachtest-gdb"
 else
 	xvfb-run -a -s "-screen 0 640x480x24" dh_auto_test --max-parallel=1 -B obj-qt5
 endif

-- 
gammaray packaging