[SCM] kplotting packaging branch, master, updated. debian/5.37.0-2-77-g14f4dcf

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 7f5fa5a1b7adacb1d69e649e9a92b69eeec91eaa
Author: Harald Sitter <sitter at kde.org>
Date:   Wed May 4 11:33:48 2016 +0200

    kill children to make sure testsuite exits
---
 debian/tests/testsuite | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/tests/testsuite b/debian/tests/testsuite
index 07adfac..30b8fc5 100755
--- a/debian/tests/testsuite
+++ b/debian/tests/testsuite
@@ -6,6 +6,6 @@ mkdir "$HOME"/.config || true
 xvfb-run -a --server-args="-screen 0 1024x768x24" \
     Xephyr -reset -br -screen 1024x768 :2 & x_pid=$!
 
-trap "kill ${x_pid}; rm -rf debian/tests.home" EXIT
+trap "pkill -TERM -P ${x_pid}; kill ${x_pid}; rm -rf debian/tests.home" EXIT
 
 DISPLAY=:2 dbus-launch --exit-with-session dh_auto_test

-- 
kplotting packaging