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

Proposed by ԜаӀtеr Ⅼарсһуnѕkі
Status: Merged
Merged at revision: 254e048d5a2cbb97052d3e6fe273bfdf4421e0f7
Proposed branch: ~wxl/kubuntu-packaging/+git/plasma-workspace:kubuntu_unstable
Merge into: ~kubuntu-packagers/kubuntu-packaging/+git/plasma-workspace:kubuntu_unstable
Diff against target: 58 lines (+11/-6)
2 files modified
debian/changelog (+6/-1)
debian/control (+5/-5)
Reviewer Review Type Date Requested Status
Rik Mills Approve
Review via email: mp+310623@code.launchpad.net

Description of the change

Merging kubuntu_zesty_archive into kubuntu_unstable, solving http://kci.pangea.pub/job/merger_plasma-workspace/958/consoleFull

changelog line switcheroo.

To post a comment you must log in.
Revision history for this message
Rik Mills (rikmills) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index f7f1e4e..75746d5 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,9 +1,14 @@
6-plasma-workspace (4:5.7.5-0ubuntu2) UNRELEASED; urgency=medium
7+plasma-workspace (4:5.8.3-0ubuntu1) UNRELEASED; urgency=medium
8
9+ [ José Manuel Santamaría Lema ]
10 * Refresh patch kubuntu_startkde-qtpath.diff
11 * Update Vcs-Git fields to use https:// instead of git://
12 * Install new files
13
14+ [ Simon Quigley ]
15+ * New upstream release (5.8.3)
16+ * New upstream release (5.8.3)
17+
18 -- José Manuel Santamaría Lema <panfaust@gmail.com> Sat, 29 Oct 2016 16:48:36 +0200
19
20 plasma-workspace (4:5.7.5-0ubuntu1) yakkety; urgency=medium
21diff --git a/debian/control b/debian/control
22index 08ae751..fc24ed4 100644
23--- a/debian/control
24+++ b/debian/control
25@@ -10,9 +10,9 @@ Build-Depends: baloo-kf5-dev (>= 5.24.0~),
26 kdoctools-dev (>= 5.24.0~),
27 kinit-dev (>= 5.24.0~),
28 kio-dev (>= 5.24.0~),
29- kscreenlocker-dev (>= 5.7.5~),
30+ kscreenlocker-dev (>= 5.8.3~),
31 kwayland-dev (>= 4:5.24.0~),
32- kwin-dev (>= 4:5.7.5~),
33+ kwin-dev (>= 4:5.8.3~),
34 libboost-dev,
35 libdbusmenu-qt5-dev,
36 libgps-dev,
37@@ -35,10 +35,10 @@ Build-Depends: baloo-kf5-dev (>= 5.24.0~),
38 libkf5package-dev (>= 5.24.0~),
39 libkf5prison-dev (>= 1.2.2),
40 libkf5runner-dev (>= 5.24.0~),
41- libkf5screen-dev (>= 4:5.7.5~),
42+ libkf5screen-dev (>= 4:5.8.3~),
43 libkf5solid-dev (>= 5.24.0~),
44 libkf5su-dev (>= 5.24.0~),
45- libkf5sysguard-dev (>= 4:5.7.5~),
46+ libkf5sysguard-dev (>= 4:5.8.3~),
47 libkf5texteditor-dev (>= 5.24.0~),
48 libkf5textwidgets-dev (>= 5.24.0~),
49 libkf5wallet-dev (>= 5.24.0~),
50@@ -77,7 +77,7 @@ Build-Depends: baloo-kf5-dev (>= 5.24.0~),
51 pkg-config,
52 pkg-kde-tools (>= 0.15.18~),
53 plasma-framework-dev (>= 5.24.0~),
54- plasma-integration (>= 5.7.5~),
55+ plasma-integration (>= 5.8.3~),
56 qtbase5-dev (>= 5.6.1~),
57 qtdeclarative5-dev (>= 5.6.1~),
58 qtscript5-dev (>= 5.6.1~),

Subscribers

People subscribed via source and target branches