Merge ~gsilvapt/kubuntu-packaging/+git/lskat:kubuntu_unstable into ~kubuntu-packagers/kubuntu-packaging/+git/lskat:kubuntu_unstable

Proposed by Gustavo Silva on 2017-06-12
Status: Merged
Merged at revision: 7e15db0655ba6b4de960edb56892b66f0d4aeb64
Proposed branch: ~gsilvapt/kubuntu-packaging/+git/lskat:kubuntu_unstable
Merge into: ~kubuntu-packagers/kubuntu-packaging/+git/lskat:kubuntu_unstable
Diff against target: 30 lines (+17/-2)
1 file modified
debian/control (+17/-2)
Reviewer Review Type Date Requested Status
Kubuntu Packagers 2017-06-12 Pending
Review via email: mp+325466@code.launchpad.net

Description of the Change

Fix for building dependencies in KF5.

To post a comment you must log in.
Clive Johnston (clivejo) wrote :

There are merge markers in this commit, please resolve the conflict

Gustavo Silva (gsilvapt) wrote :

I have no clue what happened here but there was definitely something I did with Git that caused this. My branch was I commit behind and when I pulled, I had those marks.

Oh well, I think this fixes the issue.

Sorry!

Gustavo Silva (gsilvapt) wrote :

Now it builds locally: https://paste.ubuntu.com/24841772/

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/control b/debian/control
2index aad12df..fb6ed24 100644
3--- a/debian/control
4+++ b/debian/control
5@@ -12,8 +12,23 @@ Uploaders: Daniel Schepler <schepler@debian.org>,
6 Maximiliano Curia <maxy@debian.org>
7 Build-Depends: cmake,
8 debhelper (>= 9),
9- kde-sc-dev-latest (>= 4:4.11),
10- kdelibs5-dev (>= 4:4.14.33~),
11+ extra-cmake-modules (>= 1.7.0),
12+ libkf5config-dev (>= 5.15.0),
13+ libkf5configwidgets-dev (>= 5.15.0),
14+ libkf5coreaddons-dev (>= 5.15.0),
15+ libkf5crash-dev (>= 5.15.0),
16+ libkf5dbusaddons-dev (>= 5.15.0),
17+ libkf5doctools-dev (>= 5.15.0),
18+ libkf5guiaddons-dev (>= 5.15.0),
19+ libkf5i18n-dev (>= 5.15.0),
20+ libkf5kdegames-dev (>= 4.9.0),
21+ libphonon4qt5-dev,
22+ libkf5notifyconfig-dev (>= 5.15.0),
23+ libkf5widgetsaddons-dev (>= 5.15.0),
24+ libkf5xmlgui-dev (>= 5.15.0),
25+ libqt5svg5-dev (>= 5.3.0),
26+ pkg-kde-tools (>= 0.14),
27+ qtbase5-dev (>= 5.3.0),
28 libkdegames-dev,
29 pkg-kde-tools (>= 0.14)
30 Standards-Version: 3.9.6

Subscribers

People subscribed via source and target branches