[SCM] knotifyconfig packaging branch, kubuntu_unstable, updated. debian/5.11.0-1-3-gfe2170f

[Harald Sitter]

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

The following commit has been merged in the kubuntu_unstable branch:
commit fe2170f56d11cc0706c8d8a8bbc5c6f28e9d8552
Merge: bf04c674d38be6f45282c757a8b83ea014dacd5c 7acd9ab8bc672cab0da46510bc854cf5d60f8c90
Author: Harald Sitter <sitter at kde.org>
Date:   Thu Jul 2 07:54:55 2015 +0200

    Merge branch 'master' into kubuntu_unstable
    
    Conflicts:
    	debian/control

 debian/changelog |  7 +++++++
 debian/control   | 22 +++++++++++-----------
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --cc debian/changelog
index 8f91c61,f9da1c9..08e5729
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,10 +1,20 @@@
+ knotifyconfig (5.11.0-1) unstable; urgency=medium
+ 
+   * New upstream release (5.10.0).
+   * New upstream release (5.11.0).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Mon, 29 Jun 2015 10:31:32 +0200
+ 
 +knotifyconfig (5.10.0-0ubuntu1) wily; urgency=medium
 +
 +  [ Maximiliano Curia ]
 +  * New upstream release (5.10.0).
 +
 +  [ Jonathan Riddell ]
 +  * New upstream release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 03 Jun 2015 21:07:25 +0200
 +
  knotifyconfig (5.9.0-1) experimental; urgency=medium
  
    * New upstream release (5.9.0).
diff --cc debian/control
index acb759b,81ed357..0836698
--- a/debian/control
+++ b/debian/control
@@@ -5,17 -5,17 +5,17 @@@ Maintainer: Debian/Kubuntu Qt/KDE Maint
  Uploaders: Maximiliano Curia <maxy at debian.org>
  Build-Depends: cmake (>= 2.8.12),
                 debhelper (>= 9),
-                extra-cmake-modules (>= 5.10.0),
-                kio-dev (>= 5.10.0),
-                libkf5completion-dev (>= 5.10.0),
-                libkf5config-dev (>= 5.10.0),
-                libkf5configwidgets-dev (>= 5.10.0),
-                libkf5i18n-dev (>= 5.10.0),
+                extra-cmake-modules (>= 5.11.0~),
+                kio-dev (>= 5.11.0~),
+                libkf5completion-dev (>= 5.11.0~),
+                libkf5config-dev (>= 5.11.0~),
+                libkf5configwidgets-dev (>= 5.11.0~),
+                libkf5i18n-dev (>= 5.11.0~),
 -               libkf5iconthemes-dev (>= 5.7.0),
 +               libkf5iconthemes-dev (>= 5.10.0),
-                libkf5notifications-dev (>= 5.10.0),
+                libkf5notifications-dev (>= 5.11.0~),
 -               libkf5service-dev (>= 5.9.0~),
 +               libkf5service-dev (>= 5.10.0),
-                libkf5widgetsaddons-dev (>= 5.10.0),
-                libkf5xmlgui-dev (>= 5.10.0),
+                libkf5widgetsaddons-dev (>= 5.11.0~),
+                libkf5xmlgui-dev (>= 5.11.0~),
                 libphonon4qt5-dev (>= 4.6.60~),
                 libphonon4qt5experimental-dev,
                 pkg-kde-tools (>= 0.15.15ubuntu1~),

-- 
knotifyconfig packaging