[SCM] kcmutils packaging branch, kubuntu_wily_archive, updated. debian/5.9.0-1-3-gb37c506

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_wily_archive branch:
commit 4e14fa0fdd17e3041d88cfb657665208686f1f8c
Merge: ec53c7cdf4aa457ee8aa3055b4d0d8b0012549f4 faa8ed7ddb5ec067ecc9e1ae936b7b3a431b4b5c
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Mar 6 09:56:54 2015 +0100

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

 debian/changelog |  6 ++++++
 debian/control   | 26 +++++++++++++-------------
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --cc debian/changelog
index 7393987,e33f77f..7b4b47f
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,22 -1,9 +1,28 @@@
 +kcmutils (5.7.0-1~) UNRELEASED; urgency=medium
 +
 +  * New upstream release (5.7.0).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Tue, 24 Feb 2015 17:38:12 +0100
 +
+ kcmutils (5.7.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Harald Sitter <sitter at kde.org>  Tue, 10 Feb 2015 16:48:21 +0100
+ 
 +kcmutils (5.6.0-1) experimental; urgency=medium
 +
 +  * Prepare initial Debian release.
 +  * Update build dependencies to build against experimental and to
 +    follow cmake.
 +  * Update copyright information.
 +  * Add basic autopkgtests support.
 +  * Update watch file.
 +  * Bump Standards-Version to 3.9.6, no changes needed.
 +  * Update install files.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Thu, 29 Jan 2015 13:00:16 +0100
 +
  kcmutils (5.6.0-0ubuntu1) vivid; urgency=medium
  
    * New upstream release
diff --cc debian/control
index 45b6bef,ee032f2..3f53f09
--- a/debian/control
+++ b/debian/control
@@@ -3,20 -3,32 +3,20 @@@ 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),
-                libkf5configwidgets-dev (>= 5.6.0),
-                libkf5coreaddons-dev (>= 5.6.0),
-                libkf5i18n-dev (>= 5.6.0),
-                libkf5iconthemes-dev (>= 5.6.0),
-                libkf5itemviews-dev (>= 5.6.0),
-                libkf5service-dev (>= 5.6.0),
-                libkf5xmlgui-dev (>= 5.6.0),
+                extra-cmake-modules (>= 1.7.0),
 -               libkf5attica-dev (>= 5.7.0),
 -               libkf5auth-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),
 -               libkf5kjs-dev (>= 5.7.0),
+                libkf5service-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
 -Standards-Version: 3.9.5
 +               qtbase5-dev (>= 5.2.0)
 +Standards-Version: 3.9.6
 +XS-Testsuite: autopkgtest
  Homepage: https://projects.kde.org/projects/frameworks/kcmutils
  Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/frameworks/kcmutils.git
  Vcs-Git: git://anonscm.debian.org/pkg-kde/frameworks/kcmutils.git
@@@ -24,12 -36,12 +24,12 @@@
  Package: libkf5kcmutils-dev
  Section: libdevel
  Architecture: any
- Depends: libkf5configwidgets-dev (>= 5.6.0),
-          libkf5iconthemes-dev (>= 5.6.0),
-          libkf5itemviews-dev (>= 5.6.0),
 -Depends: libkf5configwidgets-dev,
 -         libkf5iconthemes-dev,
 -         libkf5itemviews-dev,
++Depends: libkf5configwidgets-dev (>= 5.7.0),
++         libkf5iconthemes-dev (>= 5.7.0),
++         libkf5itemviews-dev (>= 5.7.0),
           libkf5kcmutils5 (= ${binary:Version}),
-          libkf5service-dev (>= 5.6.0),
-          libkf5xmlgui-dev (>= 5.6.0),
 -         libkf5service-dev,
 -         libkf5xmlgui-dev,
++         libkf5service-dev (>= 5.7.0),
++         libkf5xmlgui-dev (>= 5.7.0),
           ${misc:Depends}
  Description: Extra APIs to write KConfig modules.
   Some utility classes for KSettings, KCModule and KPlugin.

-- 
kcmutils packaging