[SCM] libkscreen packaging branch, master, updated. debian/5.4.3-1-18-gda48c6b

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/libkscreen.git;a=commitdiff;h=17a6f7d

The following commit has been merged in the master branch:
commit 17a6f7d8473c7e0d9b046d8dce36a620a8abd1d7
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Mon Feb 29 19:00:49 2016 +0100

    Move unit tests to autopkgtests.
---
 debian/control         | 5 +----
 debian/rules           | 3 ++-
 debian/tests/control   | 6 +++---
 debian/tests/testsuite | 8 +++++++-
 4 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/debian/control b/debian/control
index d679116..eeac0cf 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,6 @@ Priority: optional
 Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Maximiliano Curia <maxy at debian.org>
 Build-Depends: cmake (>= 2.8.12),
-               dbus-x11,
                debhelper (>= 9),
                extra-cmake-modules (>= 5.14.0~),
                libqt5x11extras5-dev (>= 5.4),
@@ -15,9 +14,7 @@ Build-Depends: cmake (>= 2.8.12),
                libxrandr-dev,
                pkg-config,
                pkg-kde-tools (>= 0.15.15ubuntu1~),
-               qtbase5-dev (>= 5.4),
-               xauth,
-               xvfb
+               qtbase5-dev (>= 5.4)
 Standards-Version: 3.9.7
 Homepage: https://projects.kde.org/projects/kde/workspace/libkscreen
 Vcs-Browser: https://anonscm.debian.org/git/pkg-kde/plasma/libkscreen.git
diff --git a/debian/rules b/debian/rules
index d46cedb..6193d5f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,4 +11,5 @@ override_dh_strip:
 	$(overridden_command) --dbgsym-migration='libkscreen-dbg (<= 4:5.5.4-2~~)'
 
 override_dh_auto_test:
-	-xvfb-run -a dh_auto_test
+	# Disable tests at build time
+	:
diff --git a/debian/tests/control b/debian/tests/control
index 541be7d..c6d26ac 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,6 +1,6 @@
-# Tests: testsuite
-# Depends: @, @builddeps@, build-essential
-# Restrictions: build-needed
+Tests: testsuite
+Depends: @, @builddeps@, build-essential, xvfb-run, xauth, dbus-x11, libgl1-mesa-dri
+Restrictions: build-needed
 
 Tests: acc
 Depends: @, dh-acc, exuberant-ctags
diff --git a/debian/tests/testsuite b/debian/tests/testsuite
index dabe645..89421f3 100755
--- a/debian/tests/testsuite
+++ b/debian/tests/testsuite
@@ -1,3 +1,9 @@
 #!/bin/sh
 
-dh_auto_test
+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" \
+    dbus-launch --exit-with-session dh_auto_test

-- 
libkscreen packaging