[SCM] knotifications packaging branch, kubuntu_wily_archive, updated. debian/5.9.0-1-5-g032e2e8

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_wily_archive branch:
commit 5aa13dfe2a6fac4f4c6e6b7aaf0e8d1181ddf1da
Merge: 43b95c9a894ff6343ac5b230afc2699fc41836fd 740665d1f9a65cacc5fa069f928e2ff2afd17339
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Mar 6 10:18:50 2015 +0100

    Merge remote-tracking branch 'origin/kubuntu_vivid_archive'
    
    Conflicts:
    	debian/control
    	debian/copyright
    	debian/libkf5notifications-data.install

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

diff --cc debian/changelog
index 1962543,ce6b689..4ca1ccd
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,23 -1,9 +1,29 @@@
 +knotifications (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:22 +0100
 +
+ knotifications (5.7.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Harald Sitter <sitter at kde.org>  Tue, 10 Feb 2015 16:48:58 +0100
+ 
 +knotifications (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.
 +  * Add basic autopkgtests support.
 +  * Update install files.
 +  * Update watch file.
 +  * Add missing dev dependency (thanks to acc headers check)
 +
 + -- Maximiliano Curia <maxy at debian.org>  Tue, 27 Jan 2015 22:05:57 +0100
 +
  knotifications (5.6.0-0ubuntu1) vivid; urgency=medium
  
    * New upstream release
diff --cc debian/control
index 05501f5,70e36a6..7159905
--- a/debian/control
+++ b/debian/control
@@@ -4,25 -4,31 +4,25 @@@ Priority: optiona
  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),
 +               debhelper (>= 9),
-                extra-cmake-modules (>= 1.6.0),
+                extra-cmake-modules (>= 1.7.0),
                 libdbusmenu-qt5-dev,
-                libkf5codecs-dev (>= 5.6.0),
-                libkf5config-dev (>= 5.6.0),
-                libkf5coreaddons-dev (>= 5.6.0),
-                libkf5iconthemes-dev (>= 5.6.0),
-                libkf5service-dev (>= 5.6.0),
-                libkf5windowsystem-dev (>= 5.6.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),
 -               libkf5dbusaddons-dev (>= 5.7.0),
 -               libkf5guiaddons-dev (>= 5.7.0),
 -               libkf5i18n-dev (>= 5.7.0),
+                libkf5iconthemes-dev (>= 5.7.0),
 -               libkf5itemviews-dev (>= 5.7.0),
+                libkf5service-dev (>= 5.7.0),
 -               libkf5widgetsaddons-dev (>= 5.7.0),
+                libkf5windowsystem-dev (>= 5.7.0),
                 libphonon4qt5-dev,
                 libphonon4qt5experimental-dev,
 -               libqt5x11extras5-dev,
 +               libqt5x11extras5-dev (>= 5.2.0),
                 pkg-config,
                 pkg-kde-tools (>= 0.15.15ubuntu1~),
 -               qtbase5-dev,
 +               qtbase5-dev (>= 5.2.0),
                 qttools5-dev,
                 qttools5-dev-tools
 -Standards-Version: 3.9.5
 +Standards-Version: 3.9.6
 +XS-Testsuite: autopkgtest
  Homepage: https://projects.kde.org/projects/frameworks/knotifications
  Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/frameworks/knotifications.git
  Vcs-Git: git://anonscm.debian.org/pkg-kde/frameworks/knotifications.git
@@@ -30,10 -36,9 +30,10 @@@
  Package: libkf5notifications-dev
  Section: libdevel
  Architecture: any
- Depends: libkf5coreaddons-dev (>= 5.6.0),
 -Depends: libkf5notifications5 (= ${binary:Version}),
 -         libkf5windowsystem-dev,
 -         qtbase5-dev,
++Depends: libkf5coreaddons-dev (>= 5.7.0),
 +         libkf5notifications5 (= ${binary:Version}),
-          libkf5windowsystem-dev (>= 5.6.0),
++         libkf5windowsystem-dev (>= 5.7.0),
 +         qtbase5-dev (>= 5.2.0),
           ${misc:Depends}
  Description: Framework for desktop notifications
   KNotification is used to notify the user of an event. It covers

-- 
knotifications packaging