[SCM] kwidgetsaddons packaging branch, master, updated. debian/5.19.0-1-26-g34fab8b

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kwidgetsaddons.git;a=commitdiff;h=2b5afb8

The following commit has been merged in the master branch:
commit 2b5afb854c8959fb137b5661361f233b5b4d8a94
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Wed May 4 21:35:17 2016 +0200

    Drop Xephyr hack
---
 debian/tests/control            |  2 +-
 debian/tests/testsuite          | 12 +++---------
 debian/tests/testsuite.xsession |  4 ++++
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/debian/tests/control b/debian/tests/control
index bdd3d8f..2ff8461 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,5 +1,5 @@
 Tests: testsuite
-Depends: @, @builddeps@, build-essential, xvfb, xauth, dbus-x11, xserver-xephyr
+Depends: @, @builddeps@, build-essential, xvfb, xauth, dbus-x11
 Restrictions: build-needed
 
 Tests: acc
diff --git a/debian/tests/testsuite b/debian/tests/testsuite
index b812e39..c49c862 100755
--- a/debian/tests/testsuite
+++ b/debian/tests/testsuite
@@ -2,13 +2,7 @@
 
 [ -e debian/tests.home ] || mkdir debian/tests.home
 export HOME="$(pwd)/debian/tests.home"
-mkdir "$HOME"/.config || true
-export LANG=C.UTF-8
-export LC_ALL=C.UTF-8
-
+mkdir -p "$HOME"/.config || true
+trap "rm -rf debian/tests.home" EXIT
 xvfb-run -a --server-args="-screen 0 1024x768x24" \
-    Xephyr -reset -br -screen 1024x768 :2 & x_pid=$!
-
-trap "kill ${x_pid}; rm -rf debian/tests.home" EXIT
-
-DISPLAY=:2 dbus-launch --exit-with-session dh_auto_test
+    dbus-launch --exit-with-session debian/tests/testsuite.xsession
diff --git a/debian/tests/testsuite.xsession b/debian/tests/testsuite.xsession
new file mode 100755
index 0000000..35976a5
--- /dev/null
+++ b/debian/tests/testsuite.xsession
@@ -0,0 +1,4 @@
+#!/bin/sh
+export LANG=C.UTF-8
+export LC_ALL=C.UTF-8
+dh_auto_test

-- 
kwidgetsaddons packaging