Merge ~tsimonq2/kubuntu-packaging/+git/kubuntu-ark:kubuntu_zesty_archive into ~kubuntu-packagers/kubuntu-packaging/+git/ark:kubuntu_zesty_archive

[Simon Quigley]

Fix the autopkgtests by using okular's packaging as a model.

[Jose Manuel Santamaria Lema (panfaust)]

review: Needs Fixing

[Jose Manuel Santamaria Lema (panfaust)]

These changes aren't correct at all:
1. Inside an evironment without $HOME, one of the tests would hang; this problem wasn't addressed at all while at the same time they are other unneeded, bad changes, see below.
2. xauth, dbus-x11, texlive-latex-base, xscreensaver were added to the test depends. They are not needed.
3. No need to call dbus-launch from the scripts.
4. No need to call kdeinit5 from the scripts

> Fix the autopkgtests by using okular's packaging as a model.

It seems to me rather than using the okular as a source of inspiration you just copied some files without actually checking very well what you did.

I have pushed the proper fix to kubuntu_zesty_archive.

[Rik Mills (rikmills)]

1. The tests all passed and the package migrated.

2. quite likely

diff --git a/debian/changelog b/debian/changelog
index 7cae88e..90666aa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ark (4:16.12.1-0ubuntu2) UNRELEASED; urgency=medium
+
+  * Fix the autopkgtests by using okular as a model (LP: #1662060).
+
+ -- Simon Quigley <[e-mail]>  Sun, 05 Feb 2017 22:17:10 -0600
+
 ark (4:16.12.1-0ubuntu1) zesty; urgency=medium
 
   [ José Manuel Santamaría Lema ]
diff --git a/debian/tests/control b/debian/tests/control
index 2b720f3..1f6913d 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,3 +1,5 @@
 Tests: testsuite
-Depends: @, @builddeps@, build-essential, xvfb
+Depends: @, @builddeps@, build-essential,
+         xvfb, xauth, dbus-x11,
+         texlive-latex-base, xscreensaver
 Restrictions: build-needed
diff --git a/debian/tests/testsuite b/debian/tests/testsuite
index f6083b5..fa0feb1 100755
--- a/debian/tests/testsuite
+++ b/debian/tests/testsuite
@@ -1,3 +1,4 @@
 #!/bin/sh
 
-xvfb-run -a dh_auto_test
+xvfb-run -a --server-args="-screen 0 1024x768x24" \
+    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..b1c5c10
--- /dev/null
+++ b/debian/tests/testsuite.xsession
@@ -0,0 +1,7 @@
+#!/bin/sh
+export LANG=C.UTF-8
+export LC_ALL=C.UTF-8
+kdeinit5
+trap "kdeinit5_shutdown" EXIT
+
+dh_auto_test