[SCM] cantor packaging branch, master, updated. debian/15.08.3-1-20-ga548c7e

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/cantor.git;a=commitdiff;h=3eaa39d

The following commit has been merged in the master branch:
commit 3eaa39dc3576bba570ad419f19c269fe5e9eec1f
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Mon Feb 29 08:40:31 2016 +0100

    Update testsuite, drop xephyr
---
 debian/tests/control            |  2 +-
 debian/tests/testsuite          | 11 +++++------
 debian/tests/testsuite.xsession |  4 ----
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/debian/tests/control b/debian/tests/control
index a732bda..9ce6e9b 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,5 +1,5 @@
 Tests: testsuite
 Depends: @, @builddeps@, build-essential,
          xvfb, xauth, dbus-x11,
-         gnuplot, python-numpy, xserver-xephyr, libgl1-mesa-dri
+         gnuplot, python-numpy, libgl1-mesa-dri
 Restrictions: build-needed
diff --git a/debian/tests/testsuite b/debian/tests/testsuite
index d8e054c..b7eff75 100755
--- a/debian/tests/testsuite
+++ b/debian/tests/testsuite
@@ -1,9 +1,8 @@
 #!/bin/sh
+export LANG=C.UTF-8
+export LC_ALL=C.UTF-8
+export HOME=$(mktemp -d)
+trap "rm -rf ${HOME}" EXIT
 
 xvfb-run -a --server-args="-screen 0 1024x768x24" \
-    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
+    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 35976a5..0000000
--- a/debian/tests/testsuite.xsession
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-export LANG=C.UTF-8
-export LC_ALL=C.UTF-8
-dh_auto_test

-- 
cantor packaging