[SCM] marble packaging branch, master, updated. debian/15.08.3-1-42-g049ab6f

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/marble.git;a=commitdiff;h=505bdd5

The following commit has been merged in the master branch:
commit 505bdd5e0cb81c8ec1adafeb28b2b9dcca2c62cf
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Sun Feb 14 07:45:04 2016 +0100

    Hacky use of xephyr
---
 debian/tests/control   | 2 +-
 debian/tests/testsuite | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/debian/tests/control b/debian/tests/control
index 808f131..28f48e8 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,6 +1,6 @@
 Tests: testsuite
 Depends: @, @builddeps@, build-essential,
-         xvfb, xauth, dbus-x11
+         xvfb, xauth, dbus-x11, xserver-xephyr
 Restrictions: build-needed
 
 Tests: acc
diff --git a/debian/tests/testsuite b/debian/tests/testsuite
index fa0feb1..f47a079 100755
--- a/debian/tests/testsuite
+++ b/debian/tests/testsuite
@@ -1,4 +1,8 @@
 #!/bin/sh
 
 xvfb-run -a --server-args="-screen 0 1024x768x24" \
-    dbus-launch --exit-with-session debian/tests/testsuite.xsession
+    Xephyr -reset -br -screen 1024x768 :2 & x_pid=$!
+
+trap "{ kill ${x_pid} }" EXIT
+
+DISPLAY=:2 dbus-launch --exit-with-session dh_auto_test

-- 
marble packaging