[SCM] knewstuff packaging branch, master, updated. 7a4752ac1add708789c2a0f95067421ea7ee4d5d

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 52f34b1403aeb2ee273a11b6c08e4239ae1f9527
Merge: 2eca235ef0054bca3e7c41d71c506088515710f8 c955415a61cfdfc0eb5d6000266734e32a1d2034
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Mar 6 10:31:21 2015 +0100

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

 debian/changelog |  6 ++++++
 debian/control   | 36 ++++++++++++++++++------------------
 2 files changed, 24 insertions(+), 18 deletions(-)

diff --cc debian/changelog
index ddc735f,bf0c7f1..1d567f5
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,22 -1,9 +1,28 @@@
 +knewstuff (5.7.0-1~) UNRELEASED; urgency=medium
 +
 +  * New upstream release (5.7.0).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Tue, 24 Feb 2015 17:54:20 +0100
 +
+ knewstuff (5.7.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Harald Sitter <sitter at kde.org>  Tue, 10 Feb 2015 16:14:03 +0100
+ 
 +knewstuff (5.6.0-1) experimental; urgency=medium
 +
 +  * Prepare initial Debian release.
 +  * Update build dependencies to build against experimental and to
 +    follow cmake.
 +  * Bump Standards-Version to 3.9.6, no changes needed.
 +  * Add basic autopkgtests support.
 +  * Update copyright information.
 +  * Update install files.
 +  * Update watch file.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Fri, 30 Jan 2015 16:06:52 +0100
 +
  knewstuff (5.6.0-0ubuntu1) vivid; urgency=medium
  
    * New upstream release
diff --cc debian/control
index ca6cc82,ac5b74b..9114972
--- a/debian/control
+++ b/debian/control
@@@ -3,27 -3,39 +3,27 @@@ 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.11),
-                debhelper (>= 9.0.0),
-                extra-cmake-modules (>= 1.6.0),
-                kio-dev (>= 5.6.0),
-                libkf5archive-dev (>= 5.6.0),
-                libkf5attica-dev (>= 5.6.0),
-                libkf5completion-dev (>= 5.6.0),
-                libkf5config-dev (>= 5.6.0),
-                libkf5coreaddons-dev (>= 5.6.0),
-                libkf5i18n-dev (>= 5.6.0),
-                libkf5iconthemes-dev (>= 5.6.0),
-                libkf5itemviews-dev (>= 5.6.0),
-                libkf5textwidgets-dev (>= 5.6.0),
-                libkf5widgetsaddons-dev (>= 5.6.0),
-                libkf5xmlgui-dev (>= 5.6.0),
++               debhelper (>= 9),
+                extra-cmake-modules (>= 1.7.0),
+                kio-dev (>= 5.7.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),
 -               libkf5kjs-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),
                 pkg-kde-tools (>= 0.15.15ubuntu1~),
 -               qtbase5-dev,
 +               qtbase5-dev (>= 5.2),
                 xauth,
                 xvfb
 -Standards-Version: 3.9.5
 +Standards-Version: 3.9.6
 +XS-Testsuite: autopkgtest
  Homepage: https://projects.kde.org/projects/frameworks/knewstuff
  Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/frameworks/knewstuff.git
  Vcs-Git: git://anonscm.debian.org/pkg-kde/frameworks/knewstuff.git
@@@ -31,12 -43,12 +31,12 @@@
  Package: libkf5newstuff-dev
  Section: libdevel
  Architecture: any
- Depends: kio-dev (>= 5.6.0),
-          libkf5archive-dev (>= 5.6.0),
-          libkf5attica-dev (>= 5.6.0),
 -Depends: kio-dev,
 -         libkf5archive-dev,
 -         libkf5attica-dev,
++Depends: kio-dev (>= 5.7.0),
++         libkf5archive-dev (>= 5.7.0),
++         libkf5attica-dev (>= 5.7.0),
           libkf5newstuff5 (= ${binary:Version}),
-          libkf5xmlgui-dev (>= 5.6.0),
 -         libkf5xmlgui-dev,
 -         qtbase5-dev,
++         libkf5xmlgui-dev (>= 5.7.0),
 +         qtbase5-dev (>= 5.2),
           ${misc:Depends}
  Description: development files for knewstuff
   Framework for downloading and sharing additional

-- 
knewstuff packaging