[SCM] knotifications packaging branch, kubuntu_wily_archive, updated. debian/5.11.0-1-5-g5eacb78

[Scarlett Clark]

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

The following commit has been merged in the kubuntu_wily_archive branch:
commit 5eacb7850ca159cd26e2cacc6bf0258307c6aa5b
Merge: 97bbf821badc55edc2ce8abe464c69e055dc09ff abfaf7d924473e976c6cb1f63dd8f5694573fc5d
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Fri Jul 10 17:30:45 2015 -0700

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

 debian/changelog |  8 +++++++-
 debian/control   | 20 ++++++++++----------
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --cc debian/changelog
index 1bd02fd,dea07a7..f3684c6
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,4 +1,11 @@@
 +knotifications (5.12.0-0ubuntu1) UNRELEASED; urgency=medium
 +
 +  * New upstream release
++  * Fix merge.
 +
 + -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 10 Jul 2015 08:18:28 -0700
 +
- knotifications (5.10.0-0ubuntu1) wily; urgency=medium
+ knotifications (5.11.0-1) unstable; urgency=medium
  
    [ Maximiliano Curia ]
    * New upstream release (5.10.0).
diff --cc debian/control
index a6f240a,3f0f5d7..510e865
--- a/debian/control
+++ b/debian/control
@@@ -5,14 -5,14 +5,14 @@@ 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),
 -               extra-cmake-modules (>= 5.11.0~),
++               extra-cmake-modules (>= 5.12.0~),
                 libdbusmenu-qt5-dev,
-                libkf5codecs-dev (>= 5.12.0),
-                libkf5config-dev (>= 5.12.0),
-                libkf5coreaddons-dev (>= 5.12.0),
-                libkf5iconthemes-dev (>= 5.12.0),
-                libkf5service-dev (>= 5.12.0),
-                libkf5windowsystem-dev (>= 5.12.0),
 -               libkf5codecs-dev (>= 5.11.0~),
 -               libkf5config-dev (>= 5.11.0~),
 -               libkf5coreaddons-dev (>= 5.11.0~),
 -               libkf5iconthemes-dev (>= 5.11.0~),
 -               libkf5service-dev (>= 5.11.0~),
 -               libkf5windowsystem-dev (>= 5.11.0~),
++               libkf5codecs-dev (>= 5.12.0~),
++               libkf5config-dev (>= 5.12.0~),
++               libkf5coreaddons-dev (>= 5.12.0~),
++               libkf5iconthemes-dev (>= 5.12.0~),
++               libkf5service-dev (>= 5.12.0~),
++               libkf5windowsystem-dev (>= 5.12.0~),
                 libphonon4qt5-dev (>= 4.6.60~),
                 libphonon4qt5experimental-dev,
                 libqt5x11extras5-dev (>= 5.4),
@@@ -30,10 -30,10 +30,10 @@@ Vcs-Git: git://anonscm.debian.org/pkg-k
  Package: libkf5notifications-dev
  Section: libdevel
  Architecture: any
- Depends: libkf5config-dev (>= 5.12.0),
-          libkf5coreaddons-dev (>= 5.12.0),
 -Depends: libkf5config-dev (>= 5.11.0~),
 -         libkf5coreaddons-dev (>= 5.11.0~),
++Depends: libkf5config-dev (>= 5.12.0~),
++         libkf5coreaddons-dev (>= 5.12.0~),
           libkf5notifications5 (= ${binary:Version}),
-          libkf5windowsystem-dev (>= 5.12.0),
 -         libkf5windowsystem-dev (>= 5.11.0~),
++         libkf5windowsystem-dev (>= 5.12.0~),
           qtbase5-dev (>= 5.4),
           ${misc:Depends}
  Description: Framework for desktop notifications

-- 
knotifications packaging