kubuntu-packaging

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

  1. Git
  2. lp:~tsimonq2/kubuntu-packaging/+git/kubuntu-rocs
  3. kubuntu_unstable
  4. Merge into kubuntu_unstable
Proposed by Simon Quigley on 2016-07-24
Status: Merged
Merged at revision: 351b8d5e8c7e06b5e97ac4751649115a7a34fb17
Proposed branch: ~tsimonq2/kubuntu-packaging/+git/kubuntu-rocs:kubuntu_unstable
Merge into: ~kubuntu-packagers/kubuntu-packaging/+git/rocs:kubuntu_unstable
Diff against target: 49 lines (+16/-16)
1 file modified
debian/control (+16/-16)
Reviewer Review Type Date Requested Status
Kubuntu Packagers 2016-07-24 Pending
Review via email: mp+300987@code.launchpad.net

Description of the Change

This fixes the merge errors that were happening due to some dependency conflicts in debian/control.

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
1diff --git a/debian/control b/debian/control
2index a84bd29..2d616e5 100644
3--- a/debian/control
4+++ b/debian/control
5@@ -7,28 +7,28 @@ Uploaders: Eshat Cakar <info@eshat.de>,
6 Maximiliano Curia <maxy@debian.org>
7 Build-Depends: cmake (>= 3.0.0~),
8 debhelper (>= 9),
9- extra-cmake-modules (>= 1.7.0~),
10- kdoctools-dev (>= 5.7~),
11+ extra-cmake-modules (>= 5.24.0~),
12+ kdoctools-dev (>= 5.24.0~),
13 kio-dev,
14 libboost-dev (>= 1.49~),
15 libboost-graph-dev,
16 libgrantlee5-dev (>= 5.0.0~),
17- libkf5archive-dev (>= 5.7~),
18- libkf5config-dev (>= 5.7~),
19- libkf5coreaddons-dev (>= 5.7~),
20- libkf5crash-dev (>= 5.7~),
21- libkf5declarative-dev (>= 5.7~),
22- libkf5i18n-dev (>= 5.7~),
23- libkf5itemviews-dev (>= 5.7~),
24- libkf5texteditor-dev (>= 5.7~),
25- libkf5xmlgui-dev (>= 5.7~),
26- libqt5svg5-dev (>= 5.4),
27+ libkf5archive-dev (>= 5.24.0~),
28+ libkf5config-dev (>= 5.24.0~),
29+ libkf5coreaddons-dev (>= 5.24.0~),
30+ libkf5crash-dev (>= 5.24.0~),
31+ libkf5declarative-dev (>= 5.24.0~),
32+ libkf5i18n-dev (>= 5.24.0~),
33+ libkf5itemviews-dev (>= 5.24.0~),
34+ libkf5texteditor-dev (>= 5.24.0~),
35+ libkf5xmlgui-dev (>= 5.24.0~),
36+ libqt5svg5-dev (>= 5.6.1~),
37 libqt5webkit5-dev (>= 5.4),
38- libqt5xmlpatterns5-dev (>= 5.4),
39+ libqt5xmlpatterns5-dev (>= 5.6.1~),
40 pkg-kde-tools (>> 0.15.15),
41- qtbase5-dev (>= 5.4),
42- qtdeclarative5-dev (>= 5.4),
43- qtscript5-dev (>= 5.4)
44+ qtbase5-dev (>= 5.6.1~),
45+ qtdeclarative5-dev (>= 5.6.1~),
46+ qtscript5-dev (>= 5.6.1~)
47 Standards-Version: 3.9.6
48 Homepage: https://projects.kde.org/projects/kde/kdeedu/rocs
49 Vcs-Git: git://git.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/rocs

Subscribers

People subscribed via source and target branches