[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=b9db854

The following commit has been merged in the master branch:
commit b9db8549a1ff6f8592f3c1de018a57826e9bc148
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Mon Feb 15 10:28:47 2016 +0100

    First kill kdeinit, then the X
---
 debian/tests/testsuite | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/tests/testsuite b/debian/tests/testsuite
index 6a72395..f2aea1d 100755
--- a/debian/tests/testsuite
+++ b/debian/tests/testsuite
@@ -6,7 +6,7 @@ export LC_ALL=C.UTF-8
 xvfb-run -a --server-args="-screen 0 1024x768x24" \
     Xephyr -reset -br -screen 1024x768 :2 & x_pid=$!
 
-trap "kill ${x_pid}; kdeinit5_shutdown" EXIT
+trap "kdeinit5_shutdown; kill ${x_pid}" EXIT
 
 DISPLAY=:2 kdeinit5
 DISPLAY=:2 dbus-launch --exit-with-session dh_auto_test

-- 
dolphin packaging