[SCM] knotifyconfig packaging branch, kubuntu_wily_archive, updated. debian/5.9.0-1-3-gfd70c86

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_wily_archive branch:
commit c4786e4a1321d57e21d1f3da9ddedb1c9afc249d
Merge: a36c9fd9af5ad757cd6a07e00ac1de2182cb8661 3a3952300c728996dcdbc69df68d793982b35b27
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Mar 6 09:55:38 2015 +0100

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

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

diff --cc debian/changelog
index 49cbc73,e676c79..a349b58
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,22 -1,9 +1,28 @@@
 +knotifyconfig (5.7.0-1~) UNRELEASED; urgency=medium
 +
 +  * New upstream release (5.7.0).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Tue, 24 Feb 2015 17:37:50 +0100
 +
+ knotifyconfig (5.7.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Harald Sitter <sitter at kde.org>  Tue, 10 Feb 2015 16:53:54 +0100
+ 
 +knotifyconfig (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 copyright information.
 +  * Update install files.
 +  * Update watch file.
 +  * Add basic autopkgtests support.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Fri, 30 Jan 2015 16:14:24 +0100
 +
  knotifyconfig (5.6.0-0ubuntu1) vivid; urgency=medium
  
    * New upstream release
diff --cc debian/control
index e122acf,2ca46e7..882326a
--- a/debian/control
+++ b/debian/control
@@@ -3,18 -3,34 +3,19 @@@ 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),
-                libkf5completion-dev (>= 5.6.0),
-                libkf5config-dev (>= 5.6.0),
-                libkf5configwidgets-dev (>= 5.6.0),
-                libkf5i18n-dev (>= 5.6.0),
-                libkf5notifications-dev (>= 5.6.0),
-                libkf5service-dev (>= 5.6.0),
-                libkf5widgetsaddons-dev (>= 5.6.0),
-                libkf5xmlgui-dev (>= 5.6.0),
+                extra-cmake-modules (>= 1.7.0),
+                kio-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),
+                libkf5notifications-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),
                 libphonon4qt5-dev,
                 libphonon4qt5experimental-dev,
                 pkg-kde-tools (>= 0.15.15ubuntu1~),
@@@ -28,10 -43,10 +29,10 @@@ Vcs-Git: git://anonscm.debian.org/pkg-k
  Package: libkf5notifyconfig-dev
  Section: libdevel
  Architecture: any
- Depends: kio-dev (>= 5.6.0),
-          libkf5i18n-dev (>= 5.6.0),
 -Depends: kio-dev,
 -         libkf5i18n-dev,
++Depends: kio-dev (>= 5.7.0),
++         libkf5i18n-dev (>= 5.7.0),
           libkf5notifyconfig5 (= ${binary:Version}),
 -         qtbase5-dev,
 +         qtbase5-dev (>= 5.2.0),
           ${misc:Depends}
  Description: development files for knotifyconfig
   This framework offers classes to represent the configuration for an

-- 
knotifyconfig packaging