[SCM] kconfig packaging branch, master, updated. debian/5.19.0-1-30-gc720b69

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit c720b69c8385ef887affefed2bea463df8bd8075
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Wed May 4 15:46:19 2016 +0200

    Drop xephyr hack
---
 debian/tests/testsuite          | 9 +++------
 debian/tests/testsuite.xsession | 4 +---
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/debian/tests/testsuite b/debian/tests/testsuite
index f1d33c3..c49c862 100644
--- a/debian/tests/testsuite
+++ b/debian/tests/testsuite
@@ -2,10 +2,7 @@
 
 [ -e debian/tests.home ] || mkdir debian/tests.home
 export HOME="$(pwd)/debian/tests.home"
-mkdir "$HOME"/.config || true
+mkdir -p "$HOME"/.config || true
+trap "rm -rf debian/tests.home" EXIT
 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
-
-DISPLAY=:2 dbus-launch --exit-with-session debian/tests/testsuite.xsession
+    dbus-launch --exit-with-session debian/tests/testsuite.xsession
diff --git a/debian/tests/testsuite.xsession b/debian/tests/testsuite.xsession
index 202deb4..98ca5e6 100755
--- a/debian/tests/testsuite.xsession
+++ b/debian/tests/testsuite.xsession
@@ -2,7 +2,5 @@
 export LANG=C.UTF-8
 export LC_ALL=C.UTF-8
 kdeinit5
+trap kdeinit5_shutdown EXIT
 dh_auto_test
-ret=$?
-rm -rf debian/tests.home
-exit $ret

-- 
kconfig packaging