[SCM] marble packaging branch, master, updated. debian/16.08.3-1-154-g84802f6

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/marble.git;a=commitdiff;h=42dc795

The following commit has been merged in the master branch:
commit 42dc795447547692bf461ad5989084b5cdc1b036
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Mon Sep 11 22:32:18 2017 +0200

    Update testsuite
    
    Gbp-Dch: Ignore
---
 debian/tests/control            | 2 +-
 debian/tests/testsuite          | 2 +-
 debian/tests/testsuite.xsession | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian/tests/control b/debian/tests/control
index 28f48e8..83faab7 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,6 +1,6 @@
 Tests: testsuite
 Depends: @, @builddeps@, build-essential,
-         xvfb, xauth, dbus-x11, xserver-xephyr
+         xvfb, xauth, dbus, xserver-xephyr
 Restrictions: build-needed
 
 Tests: acc
diff --git a/debian/tests/testsuite b/debian/tests/testsuite
index c7e77d6..fb5c31e 100755
--- a/debian/tests/testsuite
+++ b/debian/tests/testsuite
@@ -5,4 +5,4 @@ xvfb-run -a --server-args="-screen 0 1024x768x24" \
 
 trap "kill ${x_pid}" EXIT
 
-DISPLAY=:2 dbus-launch --exit-with-session dh_auto_test
+DISPLAY=:2 dbus-run-session -- dh_auto_test
diff --git a/debian/tests/testsuite.xsession b/debian/tests/testsuite.xsession
index bd1c9db..98ca5e6 100755
--- a/debian/tests/testsuite.xsession
+++ b/debian/tests/testsuite.xsession
@@ -1,5 +1,6 @@
 #!/bin/sh
 export LANG=C.UTF-8
 export LC_ALL=C.UTF-8
-kdeinit4
+kdeinit5
+trap kdeinit5_shutdown EXIT
 dh_auto_test

-- 
marble packaging