[SCM] ktexteditor packaging branch, kubuntu_unstable, updated. ubuntu/5.15.0-0ubuntu2-6-g23aa34a

[Scarlett Clark]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/ktexteditor.git;a=commitdiff;h=23aa34a

The following commit has been merged in the kubuntu_unstable branch:
commit 23aa34a8efb691843f9a71e8c88d6b5a208f4127
Merge: 508bf515ddd7aeca97479cc29872675db9f147b1 bc54e49643c55208eca583f5bea32c00be8ab41f
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Wed Nov 11 20:46:47 2015 -0800

    Fix merge madness

 debian/changelog     | 10 +++++++---
 debian/tests/control |  1 +
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --cc debian/changelog
index 1aaedd6,fa6d027..640faf2
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,21 -1,9 +1,25 @@@
 +ktexteditor (5.15.0-0ubuntu2) UNRELEASED; urgency=medium
 +
-   [ Scarlett Clark ]
-   * Vivid backport. 
- 
 +  [ Rohan Garg ]
 +  * Drop kubuntu_workaround-katehighlightingindexer-arm.diff, because KCI
 +    doesn't build arm packages on QEMU anymore, and Mobile KCI builds them
 +    on real HW.
 +
 +  [ Scarlett Clark ]
 +  * Remove missing file. 
 +  * Seems all kate*rc files are removed. 
 +    Removed from install files.
 +  * Removed xmlgui/katepart also missing from install. 
++  * 
 +
 + -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 09 Oct 2015 00:15:37 -0700
 +
+ ktexteditor (5.15.0-0ubuntu2) xenial; urgency=medium
+ 
+   * Fix autopackagetests by adding allow-stderr to the requirements.
+ 
+  -- Philip Muškovac <yofel at kubuntu.org>  Tue, 03 Nov 2015 15:34:48 +0100
+ 
  ktexteditor (5.15.0-0ubuntu1) wily; urgency=medium
  
    [ Scarlett Clark ]

-- 
ktexteditor packaging