[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=a8095e6

The following commit has been merged in the master branch:
commit a8095e65e43858e4b5baa1fe411e89e48291958e
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Sat Feb 13 15:06:01 2016 +0100

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

diff --git a/debian/tests/control b/debian/tests/control
index db776e1..4c56e2c 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,4 +1,4 @@
 Tests: testsuite
 Depends: @, @builddeps@, build-essential,
-         xvfb, xauth, dbus-x11
-Restrictions: rw-build-tree
+         xvfb, xauth, dbus-x11, xserver-xephyr
+Restrictions: build-needed
diff --git a/debian/tests/testsuite b/debian/tests/testsuite
index c7052fc..d8e054c 100755
--- a/debian/tests/testsuite
+++ b/debian/tests/testsuite
@@ -1,13 +1,9 @@
 #!/bin/sh
 
-sed -i 's/-DKDE4_BUILD_TESTS=false/-DKDE4_BUILD_TESTS=true/' debian/rules
-if [ -d /usr/lib/ccache ]; then
-    export PATH="/usr/lib/ccache:$PATH"
-fi
-debian/rules clean 2>&1
-export DEB_HOST_MULTIARCH=`dpkg-architecture -qDEB_HOST_MULTIARCH`
-dpkg-source --before-build .
-debian/rules build 2>&1
-
 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=$!
+
+DISPLAY=:2 dbus-launch --exit-with-session debian/tests/testsuite.xsession
+ret=$?
+kill ${x_pid}
+exit $ret

-- 
kate packaging