[SCM] kwindowsystem packaging branch, master, updated. debian/5.19.0-1-6-g3007be3

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kwindowsystem.git;a=commitdiff;h=3007be3

The following commit has been merged in the master branch:
commit 3007be3630a880ed7c277d1706aa7cf1c533c45a
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Thu Apr 7 12:37:14 2016 +0200

    Remove xephyr hack
---
 debian/tests/testsuite          | 11 ++++++-----
 debian/tests/testsuite.xsession |  1 +
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/debian/tests/testsuite b/debian/tests/testsuite
index f1d33c3..89bb48b 100644
--- a/debian/tests/testsuite
+++ b/debian/tests/testsuite
@@ -3,9 +3,10 @@
 [ -e debian/tests.home ] || mkdir debian/tests.home
 export HOME="$(pwd)/debian/tests.home"
 mkdir "$HOME"/.config || true
-xvfb-run -a --server-args="-screen 0 1024x768x24" \
-    Xephyr -reset -br -screen 1024x768 :2 & x_pid=$!
-
-trap "kill ${x_pid}; rm -rf debian/tests.home" EXIT
+remove_home () {
+    rm -rf debian/tests.home
+}
+trap remove_home EXIT
 
-DISPLAY=:2 dbus-launch --exit-with-session debian/tests/testsuite.xsession
+xvfb-run -a --server-args="-screen 0 1024x768x24" \
+    dbus-launch --exit-with-session debian/tests/testsuite.xsession
diff --git a/debian/tests/testsuite.xsession b/debian/tests/testsuite.xsession
index 378232b..e2244b1 100755
--- a/debian/tests/testsuite.xsession
+++ b/debian/tests/testsuite.xsession
@@ -2,4 +2,5 @@
 export LANG=C.UTF-8
 export LC_ALL=C.UTF-8
 openbox &
+sleep 1
 dh_auto_test

-- 
kwindowsystem packaging