kubuntu-packaging

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 on 2016-07-25

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)
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Kubuntu Packagers		2016-07-25	Pending
Review via email: mp+301012@code.launchpad.net

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.

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

People subscribed via source and target branches

to all changes:

1	diff --git a/debian/changelog b/debian/changelog
2	index 9d29af4..2734589 100644
3	--- a/debian/changelog
4	+++ b/debian/changelog
5	@@ -1,5 +1,6 @@
6	plasma-workspace (4:5.7.2-0ubuntu1) UNRELEASED; urgency=medium
7
8	+ [ Clive Johnston ]
9	* New upstream release (5.7.1)
10	* Merge with Debian
11	* Removing upstream patch install_missing_header
12	@@ -9,6 +10,9 @@ plasma-workspace (4:5.7.2-0ubuntu1) UNRELEASED; urgency=medium
13	* Add libkf5holidays-dev as build dep
14	* New upstream release (5.7.2)
15
16	+ [ Simon Quigley ]
17	+ * Add qml-module-org-kde-kholidays to the plasma-workspace dependencies
18	+
19	-- Clive Johnston <clivejo@kubuntu.org> Wed, 20 Jul 2016 20:08:24 +0100
20
21	plasma-workspace (4:5.6.5.1-1) unstable; urgency=medium
22	diff --git a/debian/control b/debian/control
23	index bf2decb..143d7f8 100644
24	--- a/debian/control
25	+++ b/debian/control
26	@@ -135,6 +135,7 @@ Depends: dbus-x11,
27	qdbus-qt5,
28	qml-module-org-kde-extensionplugin,
29	qml-module-org-kde-kcoreaddons,
30	+ qml-module-org-kde-kholidays,
31	qml-module-org-kde-kquickcontrols,
32	qml-module-org-kde-kquickcontrolsaddons,
33	qml-module-org-kde-kwindowsystem,