[SCM] gwenview packaging branch, master, updated. debian/15.12.1-1-14-gf663a82

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/gwenview.git;a=commitdiff;h=6c162c4

The following commit has been merged in the master branch:
commit 6c162c4ffbf86871bdc6885cce559e9c6f56683d
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Sun Feb 14 18:29:12 2016 +0100

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

diff --git a/debian/tests/control b/debian/tests/control
index c286e50..57cf396 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, kded5, kio-extras
 Restrictions: build-needed, needs-recommends
diff --git a/debian/tests/testsuite b/debian/tests/testsuite
index 6475d17..31f1b93 100755
--- a/debian/tests/testsuite
+++ b/debian/tests/testsuite
@@ -1,9 +1,13 @@
 #!/bin/sh
 
+export LANG=C.UTF-8
+export LC_ALL=C.UTF-8
 export HOME="$(pwd)/debian/testsuite.home"
 [ -e "${HOME}" ] || mkdir "${HOME}"
 xvfb-run -a --server-args="-screen 0 1024x768x24" \
-    dbus-launch --exit-with-session debian/tests/testsuite.xsession
-ret=$?
-rm -rf "${HOME}"
-exit $ret
+    Xephyr -reset -br -screen 1024x768 :2 & x_pid=$!
+
+trap "kdeinit5_shutdown; kill ${x_pid}; rm -rf ${HOME}" 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

-- 
gwenview packaging