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

[Simon Quigley]

This fixes the merge conflict in debian/changelog that happened due to me and Rik both having an entry, I put mine below Rik's and merged.

[Rik Mills (rikmills)]

Approved

diff --git a/debian/changelog b/debian/changelog
index 0772eda..391d111 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,9 @@ plasma-workspace (4:5.7.2-0ubuntu1) UNRELEASED; urgency=medium
   [ Rik Mills ]
   * Remove legacy taskmanager which no longer exists
 
+  [ Simon Quigley ]
+  * Add qml-module-org-kde-kholidays to the plasma-workspace dependencies
+
  -- Clive Johnston <[e-mail]>  Wed, 20 Jul 2016 20:08:24 +0100
 
 plasma-workspace (4:5.6.5.1-1) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index 0e7361b..e70269b 100644
--- a/debian/control
+++ b/debian/control
@@ -135,6 +135,7 @@ Depends: dbus-x11,
          qdbus-qt5,
          qml-module-org-kde-extensionplugin,
          qml-module-org-kde-kcoreaddons,
+         qml-module-org-kde-kholidays,
          qml-module-org-kde-kquickcontrols,
          qml-module-org-kde-kquickcontrolsaddons,
          qml-module-org-kde-kwindowsystem,