[SCM] dolphin packaging branch, master, updated. debian/15.12.1-1-8-g6305fd8

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/dolphin.git;a=commitdiff;h=910bae2

The following commit has been merged in the master branch:
commit 910bae23f5994ac912248d00ac31496da0c0cf3c
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Mon Feb 15 21:17:04 2016 +0100

    Run kinit under the same dbus connection
---
 debian/tests/testsuite          | 5 ++---
 debian/tests/testsuite.xsession | 6 ++++++
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/debian/tests/testsuite b/debian/tests/testsuite
index f2aea1d..28edc4d 100755
--- a/debian/tests/testsuite
+++ b/debian/tests/testsuite
@@ -6,7 +6,6 @@ export LC_ALL=C.UTF-8
 xvfb-run -a --server-args="-screen 0 1024x768x24" \
     Xephyr -reset -br -screen 1024x768 :2 & x_pid=$!
 
-trap "kdeinit5_shutdown; kill ${x_pid}" EXIT
+trap "kill ${x_pid}" EXIT
 
-DISPLAY=:2 kdeinit5
-DISPLAY=:2 dbus-launch --exit-with-session dh_auto_test
+DISPLAY=:2 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..5e74023
--- /dev/null
+++ b/debian/tests/testsuite.xsession
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+kdeinit5
+trap "kdeinit5_shutdown" EXIT
+dh_auto_test
+

-- 
dolphin packaging