[SCM] frameworkintegration packaging branch, kubuntu_wily_archive, updated. debian/5.9.0-1-3-g5c43253

[Jonathan Riddell]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/frameworkintegration.git;a=commitdiff;h=3e02119

The following commit has been merged in the kubuntu_wily_archive branch:
commit 3e02119d31ff42b840a00097021338676835c78b
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Mon Mar 23 15:24:25 2015 +0100

    Fix testsuite environment
---
 debian/tests/control            | 2 +-
 debian/tests/testsuite.xsession | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/tests/control b/debian/tests/control
index c545680..5993791 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,7 +1,7 @@
 Tests: testsuite
 Depends: @, @builddeps@, build-essential,
          xvfb, xauth, dbus-x11, openbox,
-         oxygen-icon-theme
+         oxygen-icon-theme, kinit
 Restrictions: rw-build-tree
 
 Tests: acc
diff --git a/debian/tests/testsuite.xsession b/debian/tests/testsuite.xsession
index c849da6..e14e3fc 100755
--- a/debian/tests/testsuite.xsession
+++ b/debian/tests/testsuite.xsession
@@ -1,11 +1,14 @@
 #!/bin/sh
 export LANG=C.UTF-8
 export LC_ALL=C.UTF-8
+export XDG_CURRENT_DESKTOP=KDE
 [ -e debian/tests.home ] || mkdir debian/tests.home
 export HOME="$(pwd)/debian/tests.home"
 openbox &
+kdeinit5
 sleep 5
 dh_auto_test
 ret=$?
+kdeinit5_shutdown
 rm -rf debian/tests.home
 exit $ret

-- 
frameworkintegration packaging