[SCM] kiconthemes packaging branch, kubuntu_wily_archive, updated. debian/5.9.0-1-3-gae8ba0c

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_wily_archive branch:
commit 105ba1bdd60504e2c850a0d875d82a48f04dbc87
Merge: d9d7f5b490cd4ca15baad0d704a0bc8c222bf64e 8e332146b074482e6f83f730aee4617c3217a11f
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Mar 6 10:14:54 2015 +0100

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

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

diff --cc debian/changelog
index 5608b0a,4678aaa..0d7a5b4
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,22 -1,9 +1,28 @@@
 +kiconthemes (5.7.0-1~) UNRELEASED; urgency=medium
 +
 +  * New upstream release (5.7.0).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Tue, 24 Feb 2015 17:40:00 +0100
 +
+ kiconthemes (5.7.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Harald Sitter <sitter at kde.org>  Tue, 10 Feb 2015 16:50:20 +0100
+ 
 +kiconthemes (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.
 +  * Update install files.
 +  * Add acc autopkgtests.
 +  * Update watch file.
 +  * Update copyright information.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Tue, 27 Jan 2015 10:50:39 +0100
 +
  kiconthemes (5.6.0-0ubuntu1) vivid; urgency=medium
  
    * New upstream release
diff --cc debian/control
index 531d25f,8cc6353..15d4f41
--- a/debian/control
+++ b/debian/control
@@@ -3,17 -3,23 +3,17 @@@ 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),
-                libkf5i18n-dev (>= 5.6.0),
-                libkf5itemviews-dev (>= 5.6.0),
-                libkf5widgetsaddons-dev (>= 5.6.0),
+                extra-cmake-modules (>= 1.7.0),
 -               libkf5auth-dev (>= 5.7.0),
 -               libkf5codecs-dev (>= 5.7.0),
 -               libkf5config-dev (>= 5.7.0),
+                libkf5configwidgets-dev (>= 5.7.0),
 -               libkf5coreaddons-dev (>= 5.7.0),
 -               libkf5guiaddons-dev (>= 5.7.0),
+                libkf5i18n-dev (>= 5.7.0),
+                libkf5itemviews-dev (>= 5.7.0),
 -               libkf5kjs-dev (>= 5.7.0),
+                libkf5widgetsaddons-dev (>= 5.7.0),
                 libqt5svg5-dev,
                 pkg-kde-tools (>= 0.15.15ubuntu1~),
 -               qtbase5-dev
 -Standards-Version: 3.9.5
 +               qtbase5-dev (>= 5.2.0)
 +Standards-Version: 3.9.6
  Homepage: https://projects.kde.org/projects/frameworks/kiconthemes
  XS-Testsuite: autopkgtest
  Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/frameworks/kiconthemes.git
@@@ -31,12 -37,12 +31,12 @@@ Description: Support for icon theme
  Package: libkf5iconthemes-dev
  Section: libdevel
  Architecture: any
- Depends: libkf5configwidgets-dev (>= 5.6.0),
-          libkf5i18n-dev (>= 5.6.0),
 -Depends: libkf5config-dev,
 -         libkf5i18n-dev,
++Depends: libkf5configwidgets-dev (>= 5.7.0),
++         libkf5i18n-dev (>= 5.7.0),
           libkf5iconthemes5 (= ${binary:Version}),
-          libkf5itemviews-dev (>= 5.6.0),
-          libkf5widgetsaddons-dev (>= 5.6.0),
 -         libkf5itemviews-dev,
 -         libkf5widgetsaddons-dev,
 -         qtbase5-dev,
++         libkf5itemviews-dev (>= 5.7.0),
++         libkf5widgetsaddons-dev (>= 5.7.0),
 +         qtbase5-dev (>= 5.2.0),
           ${misc:Depends}
  Description: development files for kiconthemes
   Library to use/access icon themes in Qt. These classes

-- 
kiconthemes packaging