[SCM] ktexteditor packaging branch, kubuntu_wily_archive, updated. debian/5.9.0-1-4-g964e294

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_wily_archive branch:
commit 676124b78b2a8d08f57434b4570c47e0f1a08348
Merge: 9c425b44380dd3c28aa2f2ce5329c7631b341006 3687aee1ed52cd9581e3a9ac7bc5dd1d9b669b7a
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Mar 6 10:08:17 2015 +0100

    Merge remote-tracking branch 'origin/kubuntu_vivid_archive'
    
    Conflicts:
    	debian/control

 debian/changelog |  6 ++++++
 debian/control   | 16 ++++++++--------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --cc debian/changelog
index 7194822,3a70b6a..39333c5
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,23 -1,9 +1,29 @@@
 +ktexteditor (5.7.0-1~) UNRELEASED; urgency=medium
 +
 +  * New upstream release (5.7.0).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Tue, 24 Feb 2015 17:39:34 +0100
 +
+ ktexteditor (5.7.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Harald Sitter <sitter at kde.org>  Tue, 10 Feb 2015 17:00:21 +0100
+ 
 +ktexteditor (5.6.0-1) experimental; urgency=medium
 +
 +  * Prepare initial Debian release.
 +  * Add acc autopkgtests.
 +  * Update build dependencies to build against experimental and to
 +    follow cmake.
 +  * Bump Standards-Version to 3.9.6, no changes needed.
 +  * Update copyright information.
 +  * Update watch file.
 +  * Update install files.
 +  * Add missing dev dependency (thanks to acc headers check)
 +
 + -- Maximiliano Curia <maxy at debian.org>  Tue, 03 Feb 2015 20:32:35 +0100
 +
  ktexteditor (5.6.0-0ubuntu1) vivid; urgency=medium
  
    * New upstream release
diff --cc debian/control
index 0daee71,c1a6433..9bfd8c2
--- a/debian/control
+++ b/debian/control
@@@ -3,16 -3,36 +3,16 @@@ Section: lib
  Priority: optional
  Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
  Uploaders: Maximiliano Curia <maxy at debian.org>
 -Build-Depends: cmake,
 -               debhelper (>= 9.0.0),
 +Build-Depends: cmake (>= 2.8.12),
 +               debhelper (>= 9),
-                extra-cmake-modules (>= 1.6.0),
-                kio-dev (>= 5.6.0),
+                extra-cmake-modules (>= 1.7.0),
+                kio-dev (>= 5.7.0),
                 libgit2-dev,
-                libkf5archive-dev (>= 5.6.0),
-                libkf5config-dev (>= 5.6.0),
-                libkf5guiaddons-dev (>= 5.6.0),
-                libkf5i18n-dev (>= 5.6.0),
-                libkf5parts-dev (>= 5.6.0),
+                libkf5archive-dev (>= 5.7.0),
 -               libkf5attica-dev (>= 5.7.0),
 -               libkf5auth-dev (>= 5.7.0),
 -               libkf5bookmarks-dev (>= 5.7.0),
 -               libkf5codecs-dev (>= 5.7.0),
 -               libkf5completion-dev (>= 5.7.0),
+                libkf5config-dev (>= 5.7.0),
 -               libkf5configwidgets-dev (>= 5.7.0),
 -               libkf5coreaddons-dev (>= 5.7.0),
 -               libkf5dbusaddons-dev (>= 5.7.0),
 -               libkf5globalaccel-dev (>= 5.7.0),
+                libkf5guiaddons-dev (>= 5.7.0),
+                libkf5i18n-dev (>= 5.7.0),
 -               libkf5iconthemes-dev (>= 5.7.0),
 -               libkf5itemviews-dev (>= 5.7.0),
 -               libkf5jobwidgets-dev (>= 5.7.0),
 -               libkf5notifications-dev (>= 5.7.0),
+                libkf5parts-dev (>= 5.7.0),
 -               libkf5service-dev (>= 5.7.0),
 -               libkf5solid-dev (>= 5.7.0),
 -               libkf5sonnet-dev (>= 5.7.0),
 -               libkf5textwidgets-dev (>= 5.7.0),
 -               libkf5widgetsaddons-dev (>= 5.7.0),
 -               libkf5windowsystem-dev (>= 5.7.0),
 -               libkf5xmlgui-dev (>= 5.7.0),
                 libqt5xmlpatterns5-dev,
                 pkg-config,
                 pkg-kde-tools (>= 0.15.15ubuntu1~),
@@@ -27,9 -47,7 +27,9 @@@ Vcs-Git: git://anonscm.debian.org/pkg-k
  Package: libkf5texteditor-dev
  Section: libdevel
  Architecture: any
- Depends: libkf5parts-dev (>= 5.6.0),
 -Depends: libkf5texteditor5 (= ${binary:Version}),
++Depends: libkf5parts-dev (>= 5.7.0),
 +         libkf5texteditor5 (= ${binary:Version}),
 +         qtbase5-dev (>= 5.2.0),
           ${misc:Depends},
           ${shlibs:Depends}
  Description: provide advanced plain text editing services

-- 
ktexteditor packaging