[SCM] kate packaging branch, master, updated. debian/15.12.1-1-7-g68d4dbf

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kate.git;a=commitdiff;h=4049bea

The following commit has been merged in the master branch:
commit 4049beaa2b538fe910871809de392077dbc4be32
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Tue Feb 16 11:51:53 2016 +0100

    Drop xephyr
---
 debian/tests/control   | 2 +-
 debian/tests/testsuite | 7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/debian/tests/control b/debian/tests/control
index 4c56e2c..1216e7e 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,4 +1,4 @@
 Tests: testsuite
 Depends: @, @builddeps@, build-essential,
-         xvfb, xauth, dbus-x11, xserver-xephyr
+         xvfb, xauth, dbus-x11, kinit
 Restrictions: build-needed
diff --git a/debian/tests/testsuite b/debian/tests/testsuite
index c78296b..c4d1673 100755
--- a/debian/tests/testsuite
+++ b/debian/tests/testsuite
@@ -3,10 +3,7 @@
 export LANG=C.UTF-8
 export LC_ALL=C.UTF-8
 export HOME=$(mktemp -d)
+trap "rm -rf ${HOME}" EXIT
 
 xvfb-run -a --server-args="-screen 0 1024x768x24" \
-    Xephyr -reset -br -screen 1024x768 :2 & x_pid=$!
-
-trap "kill ${x_pid}; rm -rf ${HOME}" EXIT
-
-DISPLAY=:2 dbus-launch --exit-with-session debian/tests/testsuite.xsession
+    dbus-launch --exit-with-session debian/tests/testsuite.xsession

-- 
kate packaging