Merge ~tsimonq2/kubuntu-packaging/+git/kubuntu-akonadi:kubuntu_unstable into ~kubuntu-packagers/kubuntu-packaging/+git/akonadi:kubuntu_unstable

[Simon Quigley]

This package resolves the merge conflict that was blocking kubuntu_stable to be merged into kubuntu_unstable (caused by a dependency conflict) and manually merges.

diff --git a/debian/control b/debian/control
index f70dae5..6343625 100644
--- a/debian/control
+++ b/debian/control
@@ -10,20 +10,20 @@ Build-Depends: automoc,
                cmake (>= 2.8.12~),
                debhelper (>= 9),
                dh-apparmor,
-               extra-cmake-modules (>= 5.21.0~),
-               kdesignerplugin (>= 5.21.0~),
-               kgendesignerplugin,
-               kio-dev (>= 5.21.0~),
+               extra-cmake-modules (>= 5.24.0~),
+               kdesignerplugin (>= 5.24.0~),
+               kgendesignerplugin (>= 5.24.0~),
+               kio-dev (>= 5.24.0~),
                libboost-dev (>= 1.34.0~),
-               libkf5completion-dev (>= 5.21.0~),
-               libkf5config-dev (>= 5.21.0~),
-               libkf5dbusaddons-dev (>= 5.21.0~),
-               libkf5guiaddons-dev (>= 5.21.0~),
-               libkf5i18n-dev (>= 5.21.0~),
-               libkf5iconthemes-dev (>= 5.21.0~),
-               libkf5itemmodels-dev (>= 5.21.0~),
-               libkf5itemviews-dev (>= 5.21.0~),
-               libkf5windowsystem-dev (>= 5.21.0~),
+               libkf5completion-dev (>= 5.24.0~),
+               libkf5config-dev (>= 5.24.0~),
+               libkf5dbusaddons-dev (>= 5.24.0~),
+               libkf5guiaddons-dev (>= 5.24.0~),
+               libkf5i18n-dev (>= 5.24.0~),
+               libkf5iconthemes-dev (>= 5.24.0~),
+               libkf5itemmodels-dev (>= 5.24.0~),
+               libkf5itemviews-dev (>= 5.24.0~),
+               libkf5windowsystem-dev (>= 5.24.0~),
                libmysqlclient-dev,
                libqt5designer5,
                libsqlite3-dev (>= 3.6.23),
@@ -32,9 +32,8 @@ Build-Depends: automoc,
                libxslt1-dev,
                pkg-config,
                pkg-kde-tools (>= 0.12),
-               qtbase5-dev (>= 5.4.0~),
-               qtbase5-private-dev,
-               qttools5-dev,
+               qtbase5-dev (>= 5.6.1~),
+               qttools5-dev (>= 5.6.1~),
                shared-mime-info (>= 0.20),
                xsltproc
 Standards-Version: 3.9.8