[SCM] ktexteditor packaging branch, kubuntu_unstable, updated. debian/5.11.0-1-7-gfe84f4c

[Harald Sitter]

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

The following commit has been merged in the kubuntu_unstable branch:
commit fe84f4ce608575cb16998de9bf631b8d46a203ee
Merge: daeda252fd8332781debc5ca345061dce03d2359 60494d25bf9b9636fa8fe0bb59ae047b0a2e202b
Author: Harald Sitter <sitter at kde.org>
Date:   Thu Jul 2 07:47:27 2015 +0200

    Merge branch 'master' into kubuntu_unstable
    
    Conflicts:
    	debian/control

 debian/changelog |  7 +++++++
 debian/control   | 22 +++++++++++-----------
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --cc debian/changelog
index 6841101,2c14b88..4fad511
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,21 -1,10 +1,28 @@@
+ ktexteditor (5.11.0-1) unstable; urgency=medium
+ 
+   * New upstream release (5.10.0).
+   * New upstream release (5.11.0).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Mon, 29 Jun 2015 13:28:11 +0200
+ 
 +ktexteditor (5.10.0-0ubuntu2) UNRELEASED; urgency=medium
 +
 +  * Add kubuntu_workaround-katehighlightingindexer-arm.diff
 +  * Add libkf5texteditor5-libjs-underscore bridge package to allow
 +    installing as multi-arch
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 12 Jun 2015 08:07:46 +0200
 +
 +ktexteditor (5.10.0-0ubuntu1) wily; urgency=medium
 +
 +  [ Maximiliano Curia ]
 +  * New upstream release (5.10.0).
 +
 +  [ Jonathan Riddell ]
 +  * New upstream release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 03 Jun 2015 20:32:35 +0200
 +
  ktexteditor (5.9.0-1) experimental; urgency=medium
  
    * New upstream release (5.9.0).

-- 
ktexteditor packaging