[SCM] kguiaddons packaging branch, master, updated. debian/5.37.0-2-83-gee95721

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kguiaddons.git;a=commitdiff;h=80a2aac

The following commit has been merged in the master branch:
commit 80a2aac232df10ec47a18476f7de67475a3568f3
Author: Harald Sitter <sitter at kde.org>
Date:   Wed May 4 11:33:47 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 c7e77d6..23cc102 100755
--- a/debian/tests/testsuite
+++ b/debian/tests/testsuite
@@ -3,6 +3,6 @@
 xvfb-run -a --server-args="-screen 0 1024x768x24" \
     Xephyr -reset -br -screen 1024x768 :2 & x_pid=$!
 
-trap "kill ${x_pid}" EXIT
+trap "pkill -TERM -P ${x_pid}; kill ${x_pid}" EXIT
 
 DISPLAY=:2 dbus-launch --exit-with-session dh_auto_test

-- 
kguiaddons packaging