[SCM] knotifyconfig packaging branch, kubuntu_unstable, updated. debian/5.11.0-1-5-gec4e36a

[Kubuntu CI (Harald Sitter)]

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

The following commit has been merged in the kubuntu_unstable branch:
commit ec4e36adf06dc6125ae57d42a241040e59a69f1a
Merge: 691b159221c27ee589502429a604504d89d7e5ac fe2170f56d11cc0706c8d8a8bbc5c6f28e9d8552
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Fri Jul 10 18:59:32 2015 -0700

    Merge remote-tracking branch 'origin/kubuntu_unstable' into kubuntu_wily_archive
    
    Conflicts:
    	debian/changelog
    	debian/control

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

diff --cc debian/changelog
index 5ddda5e,08e5729..b992f89
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,10 +1,17 @@@
 +knotifyconfig (5.12.0-0ubuntu1) UNRELEASED; urgency=medium
 +
 +  * New upstream release
++  * Fix merge.
 +
 + -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 10 Jul 2015 08:19:08 -0700
 +
+ 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 ]
diff --cc debian/control
index 3cbedd5,0836698..3f3fd07
--- 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.12.0),
-                libkf5completion-dev (>= 5.12.0),
-                libkf5config-dev (>= 5.12.0),
-                libkf5configwidgets-dev (>= 5.12.0),
-                libkf5i18n-dev (>= 5.12.0),
-                libkf5iconthemes-dev (>= 5.12.0),
-                libkf5notifications-dev (>= 5.12.0),
-                libkf5service-dev (>= 5.12.0),
-                libkf5widgetsaddons-dev (>= 5.12.0),
-                libkf5xmlgui-dev (>= 5.12.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.10.0),
 -               libkf5notifications-dev (>= 5.11.0~),
 -               libkf5service-dev (>= 5.10.0),
 -               libkf5widgetsaddons-dev (>= 5.11.0~),
 -               libkf5xmlgui-dev (>= 5.11.0~),
++               extra-cmake-modules (>= 5.12.0~),
++               kio-dev (>= 5.12.0~),
++               libkf5completion-dev (>= 5.12.0~),
++               libkf5config-dev (>= 5.12.0~),
++               libkf5configwidgets-dev (>= 5.12.0~),
++               libkf5i18n-dev (>= 5.12.0~),
++               libkf5iconthemes-dev (>= 5.12.0~),
++               libkf5notifications-dev (>= 5.12.0~),
++               libkf5service-dev (>= 5.12.0~),
++               libkf5widgetsaddons-dev (>= 5.12.0~),
++               libkf5xmlgui-dev (>= 5.12.0~),
                 libphonon4qt5-dev (>= 4.6.60~),
                 libphonon4qt5experimental-dev,
                 pkg-kde-tools (>= 0.15.15ubuntu1~),
@@@ -29,8 -29,8 +29,8 @@@ Vcs-Git: git://anonscm.debian.org/pkg-k
  Package: libkf5notifyconfig-dev
  Section: libdevel
  Architecture: any
- Depends: kio-dev (>= 5.12.0),
-          libkf5i18n-dev (>= 5.12.0),
 -Depends: kio-dev (>= 5.11.0~),
 -         libkf5i18n-dev (>= 5.11.0~),
++Depends: kio-dev (>= 5.12.0~),
++         libkf5i18n-dev (>= 5.12.0~),
           libkf5notifyconfig5 (= ${binary:Version}),
           qtbase5-dev (>= 5.4),
           ${misc:Depends}

-- 
knotifyconfig packaging