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

[Simon Quigley]

This fixes the merge conflicts in debian/control. (kubuntu_stable -> kubuntu_unstable)

diff --git a/debian/control b/debian/control
index b014720..f71caff 100644
--- a/debian/control
+++ b/debian/control
@@ -5,22 +5,21 @@ Maintainer: Debian/Kubuntu Qt/KDE Maintainers <[e-mail]>
 Uploaders: Maximiliano Curia <[e-mail]>
 Build-Depends: cmake (>= 3.0.0~),
                debhelper (>= 9),
-               extra-cmake-modules (>= 5.13.0~),
-               kdoctools-dev,
-               libkf5config-dev,
-               libkf5configwidgets-dev,
-               libkf5crash-dev,
-               libkf5declarative-dev,
-               libkf5i18n-dev,
-               libkf5newstuff-dev,
-               libkf5widgetsaddons-dev,
-               libkf5xmlgui-dev,
+               extra-cmake-modules (>= 5.24.0~),
+               kdoctools-dev (>= 5.24.0~),
+               libkf5config-dev (>= 5.24.0~),
+               libkf5configwidgets-dev (>= 5.24.0~),
+               libkf5crash-dev (>= 5.24.0~),
+               libkf5declarative-dev (>= 5.24.0~),
+               libkf5i18n-dev (>= 5.24.0~),
+               libkf5newstuff-dev (>= 5.24.0~),
+               libkf5widgetsaddons-dev (>= 5.24.0~),
+               libkf5xmlgui-dev (>= 5.24.0~),
                libqt5gstreamer-dev (>= 1.2.0),
-               libqt5xmlpatterns5-dev (>= 5.5~),
+               libqt5xmlpatterns5-dev (>= 5.6.1~),
                pkg-kde-tools,
-               qtbase5-dev (>= 5.5~),
-               qtdeclarative5-dev (>= 5.5~),
-               qtmultimedia5-dev
+               qtbase5-dev (>= 5.6.1~),
+               qtdeclarative5-dev (>= 5.6.1~)
 Standards-Version: 3.9.6
 Homepage: https://edu.kde.org/
 Vcs-Browser: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/artikulate