[SCM] cantor packaging branch, kubuntu_wily_archive, updated. ubuntu/4%15.08.2-0ubuntu1-5-g3bf1d04

[Harald Sitter]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/cantor.git;a=commitdiff;h=13fad1b

The following commit has been merged in the kubuntu_wily_archive branch:
commit 13fad1bf4eed9737cd99717c0ff947c55a9f1ad4
Author: Harald Sitter <sitter at kde.org>
Date:   Thu Oct 15 12:42:30 2015 +0200

    Start kdeinit5 rather than kdeinit4 in the autopkgtest testsuite
---
 debian/changelog                | 6 ++++++
 debian/tests/testsuite.xsession | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 67adb6c..f8892ad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cantor (4:15.08.2-0ubuntu2) UNRELEASED; urgency=medium
+
+  * Start kdeinit5 rather than kdeinit4 in the autopkgtest testsuite
+
+ -- Harald Sitter <sitter at kde.org>  Thu, 15 Oct 2015 12:42:05 +0200
+
 cantor (4:15.08.2-0ubuntu1) wily; urgency=medium
 
   * Vivid backport
diff --git a/debian/tests/testsuite.xsession b/debian/tests/testsuite.xsession
index 7e49196..5216db9 100755
--- a/debian/tests/testsuite.xsession
+++ b/debian/tests/testsuite.xsession
@@ -1,8 +1,8 @@
 #!/bin/sh
 export LANG=C.UTF-8
 export LC_ALL=C.UTF-8
-kdeinit4
+kdeinit5
 dh_auto_test
 ret=$?
-kdeinit4_shutdown
+kdeinit5_shutdown
 exit $ret

-- 
cantor packaging