[SCM] konsole packaging branch, master, updated. debian/15.12.1-1-6-g86f900b

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/konsole.git;a=commitdiff;h=66f3a0c

The following commit has been merged in the master branch:
commit 66f3a0c7a3341276fd497a80a21156ba63deafde
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Sun Feb 14 16:27:27 2016 +0100

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

diff --git a/debian/tests/control b/debian/tests/control
index 62f30ec..26b5398 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,5 +1,5 @@
 Tests: testsuite
 Depends: @, @builddeps@, build-essential,
-         xvfb, xauth, dbus-x11,
+         xvfb, xauth, dbus-x11, xserver-xephyr,
          kinit
 Restrictions: build-needed
diff --git a/debian/tests/testsuite b/debian/tests/testsuite
index fa0feb1..6fa0761 100755
--- a/debian/tests/testsuite
+++ b/debian/tests/testsuite
@@ -1,4 +1,11 @@
 #!/bin/sh
 
+export LANG=C.UTF-8
+export LC_ALL=C.UTF-8
+
 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 "kdeinit5_shutdown; kill ${x_pid}" EXIT
+DISPLAY=:2 kdeinit5
+DISPLAY=:2 dbus-launch --exit-with-session dh_auto_test

-- 
konsole packaging