[SCM] kimageformats packaging branch, master, updated. debian/5.16.0-1-12-g5b25f17

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit a06ecf3b5e1694fbd580809e7985d39ac0fa5545
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Sat Feb 13 23:18:22 2016 +0100

    Add basic autopkgtests support
---
 debian/control                  | 4 +---
 debian/rules                    | 3 ++-
 debian/tests/control            | 4 ++++
 debian/tests/testsuite          | 8 ++++++++
 debian/tests/testsuite.xsession | 8 ++++++++
 5 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/debian/control b/debian/control
index 3380ecf..909d6f1 100644
--- a/debian/control
+++ b/debian/control
@@ -12,9 +12,7 @@ Build-Depends: cmake (>= 2.8.12),
                libopenjpeg-dev,
                pkg-config,
                pkg-kde-tools (>= 0.15.15ubuntu1~),
-               qtbase5-dev (>= 5.4),
-               xauth,
-               xvfb
+               qtbase5-dev (>= 5.4)
 Standards-Version: 3.9.6
 Homepage: https://projects.kde.org/projects/frameworks/kimageformats
 Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/frameworks/kimageformats.git
diff --git a/debian/rules b/debian/rules
index c5dcd15..9218cb3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,4 +10,5 @@ override_dh_strip:
 	$(overridden_command) --ddeb-migration='kimageformats-dbg (<= 5.19.0-1~~)'
 
 override_dh_auto_test:
-	xvfb-run -a $(overridden_command)
+	# Disable tests at build time
+	:
diff --git a/debian/tests/control b/debian/tests/control
new file mode 100644
index 0000000..4c56e2c
--- /dev/null
+++ b/debian/tests/control
@@ -0,0 +1,4 @@
+Tests: testsuite
+Depends: @, @builddeps@, build-essential,
+         xvfb, xauth, dbus-x11, xserver-xephyr
+Restrictions: build-needed
diff --git a/debian/tests/testsuite b/debian/tests/testsuite
new file mode 100755
index 0000000..f47a079
--- /dev/null
+++ b/debian/tests/testsuite
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+xvfb-run -a --server-args="-screen 0 1024x768x24" \
+    Xephyr -reset -br -screen 1024x768 :2 & x_pid=$!
+
+trap "{ kill ${x_pid} }" EXIT
+
+DISPLAY=:2 dbus-launch --exit-with-session dh_auto_test
diff --git a/debian/tests/testsuite.xsession b/debian/tests/testsuite.xsession
new file mode 100755
index 0000000..5216db9
--- /dev/null
+++ b/debian/tests/testsuite.xsession
@@ -0,0 +1,8 @@
+#!/bin/sh
+export LANG=C.UTF-8
+export LC_ALL=C.UTF-8
+kdeinit5
+dh_auto_test
+ret=$?
+kdeinit5_shutdown
+exit $ret

-- 
kimageformats packaging