[SCM] kate packaging branch, kubuntu_vivid_archive, updated. debian/4.14.2-2-28-gc71843b

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_vivid_archive branch:
commit c71843b14c8d22e5849bee5a4e3132c553c0fadf
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Wed Dec 17 12:22:11 2014 +0100

    Update testsuite.xsession to use kdeinit5
---
 debian/changelog                | 6 ++++++
 debian/source/local-options     | 1 -
 debian/tests/testsuite.xsession | 4 ++--
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2f17f2a..24abe6f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+kate (4:14.12.0-0ubuntu2) vivid; urgency=medium
+
+  * Update testsuite.xsession to use kdeinit5
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 17 Dec 2014 12:20:37 +0100
+
 kate (4:14.12.0-0ubuntu1) vivid; urgency=medium
 
   * New upstream release
diff --git a/debian/source/local-options b/debian/source/local-options
deleted file mode 100644
index 2ee6f0f..0000000
--- a/debian/source/local-options
+++ /dev/null
@@ -1 +0,0 @@
-abort-on-upstream-changes
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

-- 
kate packaging