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

Proposed by Simon Quigley
Status: Merged
Merged at revision: 76b4bfc3efc5b3d938932d1743e3331e81ace88a
Proposed branch: ~tsimonq2/kubuntu-packaging/+git/kubuntu-plasma-workspace:kubuntu_yakkety_archive
Merge into: ~kubuntu-packagers/kubuntu-packaging/+git/plasma-workspace:kubuntu_yakkety_archive
Diff against target: 33 lines (+5/-0)
2 files modified
debian/changelog (+4/-0)
debian/control (+1/-0)
Reviewer Review Type Date Requested Status
Kubuntu Packagers Pending
Review via email: mp+301012@code.launchpad.net

Description of the change

This adds qml-module-org-kde-kholidays to the debian/control file to fix a bug I'm having that's caused by the lack of this package.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/debian/changelog b/debian/changelog
index 9d29af4..2734589 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
1plasma-workspace (4:5.7.2-0ubuntu1) UNRELEASED; urgency=medium1plasma-workspace (4:5.7.2-0ubuntu1) UNRELEASED; urgency=medium
22
3 [ Clive Johnston ]
3 * New upstream release (5.7.1)4 * New upstream release (5.7.1)
4 * Merge with Debian5 * Merge with Debian
5 * Removing upstream patch install_missing_header6 * Removing upstream patch install_missing_header
@@ -9,6 +10,9 @@ plasma-workspace (4:5.7.2-0ubuntu1) UNRELEASED; urgency=medium
9 * Add libkf5holidays-dev as build dep10 * Add libkf5holidays-dev as build dep
10 * New upstream release (5.7.2)11 * New upstream release (5.7.2)
1112
13 [ Simon Quigley ]
14 * Add qml-module-org-kde-kholidays to the plasma-workspace dependencies
15
12 -- Clive Johnston <clivejo@kubuntu.org> Wed, 20 Jul 2016 20:08:24 +010016 -- Clive Johnston <clivejo@kubuntu.org> Wed, 20 Jul 2016 20:08:24 +0100
1317
14plasma-workspace (4:5.6.5.1-1) unstable; urgency=medium18plasma-workspace (4:5.6.5.1-1) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index bf2decb..143d7f8 100644
--- a/debian/control
+++ b/debian/control
@@ -135,6 +135,7 @@ Depends: dbus-x11,
135 qdbus-qt5,135 qdbus-qt5,
136 qml-module-org-kde-extensionplugin,136 qml-module-org-kde-extensionplugin,
137 qml-module-org-kde-kcoreaddons,137 qml-module-org-kde-kcoreaddons,
138 qml-module-org-kde-kholidays,
138 qml-module-org-kde-kquickcontrols,139 qml-module-org-kde-kquickcontrols,
139 qml-module-org-kde-kquickcontrolsaddons,140 qml-module-org-kde-kquickcontrolsaddons,
140 qml-module-org-kde-kwindowsystem,141 qml-module-org-kde-kwindowsystem,

Subscribers

People subscribed via source and target branches