kubuntu-packaging

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

  1. Git
  2. lp:~tsimonq2/kubuntu-packaging/+git/kubuntu-kturtle
  3. kubuntu_unstable
  4. Merge into kubuntu_unstable
Proposed by Simon Quigley
Status: Merged
Merged at revision: 1e3646429e828f703ea3952ada3af1682e9f3298
Proposed branch: ~tsimonq2/kubuntu-packaging/+git/kubuntu-kturtle:kubuntu_unstable
Merge into: ~kubuntu-packagers/kubuntu-packaging/+git/kturtle:kubuntu_unstable
Diff against target: 35 lines (+11/-12)
1 file modified
debian/control (+11/-12)
Reviewer Review Type Date Requested Status
Kubuntu Packagers Pending
Review via email: mp+301000@code.launchpad.net

Description of the change

This fixes the merge conflicts in the debian/control file. (kubuntu_stable -> kubuntu_unstable)

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 c2875d1..6ad411e 100644
3--- a/debian/control
4+++ b/debian/control
5@@ -7,19 +7,18 @@ Uploaders: Eshat Cakar <info@eshat.de>,
6 Maximiliano Curia <maxy@debian.org>
7 Build-Depends: cmake (>= 2.8.12~),
8 debhelper (>= 9),
9- extra-cmake-modules (>= 1.7.0~),
10- kdoctools-dev,
11- kio-dev,
12- libkf5coreaddons-dev,
13- libkf5crash-dev,
14- libkf5i18n-dev,
15- libkf5kdelibs4support-dev,
16- libkf5kiogui5 (>= 5.18.0~),
17- libkf5newstuff-dev,
18- libkf5textwidgets-dev,
19- libqt5svg5-dev (>= 5.4),
20+ extra-cmake-modules (>= 5.24.0~),
21+ kdoctools-dev (>= 5.24.0~),
22+ kio-dev (>= 5.24.0~),
23+ libkf5coreaddons-dev (>= 5.24.0~),
24+ libkf5crash-dev (>= 5.24.0~),
25+ libkf5i18n-dev (>= 5.24.0~),
26+ libkf5kdelibs4support-dev (>= 5.24.0~),
27+ libkf5newstuff-dev (>= 5.24.0~),
28+ libkf5textwidgets-dev (>= 5.24.0~),
29+ libqt5svg5-dev (>= 5.6.1~),
30 pkg-kde-tools (>= 0.12),
31- qtbase5-dev (>= 5.4)
32+ qtbase5-dev (>= 5.6.1~)
33 Standards-Version: 3.9.6
34 Homepage: https://projects.kde.org/projects/kde/kdeedu/kturtle
35 Vcs-Git: git://git.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/kturtle

Subscribers

People subscribed via source and target branches