[SCM] dolphin packaging branch, master, updated. debian/15.12.1-1-8-g6305fd8

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/dolphin.git;a=commitdiff;h=8679fdd

The following commit has been merged in the master branch:
commit 8679fdd724a545a0d96ef70c23151b547b31a3b1
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Sun Feb 14 11:17:05 2016 +0100

    Hacky use of xephyr
---
 debian/tests/control            |  2 +-
 debian/tests/testsuite          | 10 +++++++++-
 debian/tests/testsuite.xsession |  8 --------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/debian/tests/control b/debian/tests/control
index fcad5ad..0a7673f 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,6 +1,6 @@
 Tests: testsuite
 Depends: @, @builddeps@, build-essential,
-         xvfb, xauth, dbus-x11, kinit
+         xvfb, xauth, dbus-x11, kinit, xserver-xephyr
 Restrictions: build-needed
 
 Tests: acc
diff --git a/debian/tests/testsuite b/debian/tests/testsuite
index fa0feb1..525ec6c 100755
--- a/debian/tests/testsuite
+++ b/debian/tests/testsuite
@@ -1,4 +1,12 @@
 #!/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 "{ kill ${x_pid}; kdeinit5_shutdown }" EXIT
+
+DISPLAY=:2 kdeinit5
+DISPLAY=:2 dbus-launch --exit-with-session dh_auto_test
diff --git a/debian/tests/testsuite.xsession b/debian/tests/testsuite.xsession
deleted file mode 100755
index 5216db9..0000000
--- a/debian/tests/testsuite.xsession
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-export LANG=C.UTF-8
-export LC_ALL=C.UTF-8
-kdeinit5
-dh_auto_test
-ret=$?
-kdeinit5_shutdown
-exit $ret

-- 
dolphin packaging