[SCM] ktexteditor packaging branch, kubuntu_wily_archive, updated. debian/5.11.0-1-9-gdf691ab

[Scarlett Clark]

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

The following commit has been merged in the kubuntu_wily_archive branch:
commit df691ab56b8e670927a17cf3f06a6199392d95ab
Merge: 040da8890ddabf48acbf1bd724c22238d1e96c9f fe84f4ce608575cb16998de9bf631b8d46a203ee
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Fri Jul 10 23:02:13 2015 -0700

    Merge remote-tracking branch 'origin/kubuntu_unstable' into kubuntu_wily_archive
    
    Conflicts:
    	debian/changelog
    	debian/control

 debian/changelog                                   | 16 +++++++++++
 debian/control                                     | 30 +++++++++++++--------
 ...ntu_workaround-katehighlightingindexer-arm.diff | 31 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 4 files changed, 67 insertions(+), 11 deletions(-)

diff --cc debian/changelog
index 343b7e8,4fad511..258b7f9
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,18 +1,25 @@@
 +ktexteditor (5.12.0-0ubuntu1) UNRELEASED; urgency=medium
 +
 +  * New upstream release
++  * Fix merge.
 +
 + -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 10 Jul 2015 08:24:13 -0700
 +
+ 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 ]
diff --cc debian/control
index 715cc42,84c5f8c..a6df508
--- a/debian/control
+++ b/debian/control
@@@ -5,16 -5,16 +5,16 @@@ Maintainer: Debian/Kubuntu Qt/KDE Maint
  Uploaders: Maximiliano Curia <maxy at debian.org>
  Build-Depends: cmake (>= 2.8.12),
                 debhelper (>= 9),
-                extra-cmake-modules (>= 5.10.0),
-                kio-dev (>= 5.12.0),
 -               extra-cmake-modules (>= 5.11.0~),
 -               kio-dev (>= 5.11.0~),
 -               libgit2-dev (>= 0.22.0~),
 -               libkf5archive-dev (>= 5.11.0~),
 -               libkf5config-dev (>= 5.11.0~),
 -               libkf5guiaddons-dev (>= 5.11.0~),
 -               libkf5i18n-dev (>= 5.11.0~),
 -               libkf5iconthemes-dev (>= 5.11.0~),
 -               libkf5parts-dev (>= 5.11.0~),
 -               libkf5sonnet-dev (>= 5.11.0~),
++               extra-cmake-modules (>= 5.12.0~),
++               kio-dev (>= 5.12.0~),
 +               libgit2-dev,
-                libkf5archive-dev (>= 5.12.0),
-                libkf5config-dev (>= 5.12.0),
-                libkf5guiaddons-dev (>= 5.12.0),
-                libkf5i18n-dev (>= 5.12.0),
-                libkf5iconthemes-dev (>= 5.12.0),
-                libkf5parts-dev (>= 5.12.0),
-                libkf5sonnet-dev (>= 5.12.0),
++               libkf5archive-dev (>= 5.12.0~),
++               libkf5config-dev (>= 5.12.0~),
++               libkf5guiaddons-dev (>= 5.12.0~),
++               libkf5i18n-dev (>= 5.12.0~),
++               libkf5iconthemes-dev (>= 5.12.0~),
++               libkf5parts-dev (>= 5.12.0~),
++               libkf5sonnet-dev (>= 5.12.0~),
                 libqt5xmlpatterns5-dev (>= 5.4),
                 perl,
                 pkg-config,
@@@ -30,7 -30,7 +30,7 @@@ Vcs-Git: git://anonscm.debian.org/pkg-k
  Package: libkf5texteditor-dev
  Section: libdevel
  Architecture: any
- Depends: libkf5parts-dev (>= 5.12.0),
 -Depends: libkf5parts-dev (>= 5.11.0~),
++Depends: libkf5parts-dev (>= 5.12.0~),
           libkf5texteditor5 (= ${binary:Version}),
           qtbase5-dev (>= 5.4),
           ${misc:Depends},

-- 
ktexteditor packaging