kubuntu-packaging

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

Proposed by Simon Quigley on 2016-07-25

Status:	Merged
Merged at revision:	a65a513cb1a17571596555ae6e0b45c8cbb90329
Proposed branch:	~tsimonq2/kubuntu-packaging/+git/kubuntu-plasma-workspace:kubuntu_unstable
Merge into:	~kubuntu-packagers/kubuntu-packaging/+git/plasma-workspace:kubuntu_unstable
Diff against target:	26 lines (+4/-0) 2 files modified debian/changelog (+3/-0) debian/control (+1/-0)
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Rik Mills		2016-07-25	Pending
Review via email: mp+301014@code.launchpad.net

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

Approved

[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 0772eda..391d111 100644
3	--- a/debian/changelog
4	+++ b/debian/changelog
5	@@ -13,6 +13,9 @@ plasma-workspace (4:5.7.2-0ubuntu1) UNRELEASED; urgency=medium
6	[ Rik Mills ]
7	* Remove legacy taskmanager which no longer exists
8
9	+ [ Simon Quigley ]
10	+ * Add qml-module-org-kde-kholidays to the plasma-workspace dependencies
11	+
12	-- Clive Johnston <clivejo@kubuntu.org> Wed, 20 Jul 2016 20:08:24 +0100
13
14	plasma-workspace (4:5.6.5.1-1) unstable; urgency=medium
15	diff --git a/debian/control b/debian/control
16	index 0e7361b..e70269b 100644
17	--- a/debian/control
18	+++ b/debian/control
19	@@ -135,6 +135,7 @@ Depends: dbus-x11,
20	qdbus-qt5,
21	qml-module-org-kde-extensionplugin,
22	qml-module-org-kde-kcoreaddons,
23	+ qml-module-org-kde-kholidays,
24	qml-module-org-kde-kquickcontrols,
25	qml-module-org-kde-kquickcontrolsaddons,
26	qml-module-org-kde-kwindowsystem,