[SCM] gammaray packaging branch, master, updated. debian/2.1.0-3-2-g515aa89

[Felix Geyer]

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

The following commit has been merged in the master branch:
commit 515aa89173d1c5e0a437fa326c56078f570d10eb
Author: Felix Geyer <fgeyer at debian.org>
Date:   Mon Jul 28 21:05:02 2014 +0200

    Let xvfb-run choose a free server number so it doesn't fail when one is already taken.
---
 debian/changelog | 2 ++
 debian/rules     | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c68e55e..70e8445 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 gammaray (2.1.0-4) UNRELEASED; urgency=medium
 
   * Fix FTBFS on ppc64el.
+  * Let xvfb-run choose a free server number so it doesn't fail when one is
+    already taken.
 
  -- Felix Geyer <fgeyer at debian.org>  Mon, 28 Jul 2014 19:27:29 +0200
 
diff --git a/debian/rules b/debian/rules
index 796a71a..9e7fe62 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,9 +25,9 @@ override_dh_auto_build:
 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 --max-parallel=1 -B obj-qt5 || true
+	xvfb-run -a -s "-screen 0 640x480x24" dh_auto_test --max-parallel=1 -B obj-qt5 || true
 else
-	xvfb-run -s "-screen 0 640x480x24" dh_auto_test --max-parallel=1 -B obj-qt5
+	xvfb-run -a -s "-screen 0 640x480x24" dh_auto_test --max-parallel=1 -B obj-qt5
 endif
 
 override_dh_auto_install:

-- 
gammaray packaging