kubuntu-packaging

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

  1. Git
  2. lp:~tsimonq2/kubuntu-packaging/+git/kubuntu-kldap
  3. kubuntu_unstable
  4. Merge into kubuntu_unstable
Proposed by Simon Quigley on 2016-07-24
Status: Merged
Merged at revision: 4bbcf16f8e993b8c0b16ebf19316194e0b43296b
Proposed branch: ~tsimonq2/kubuntu-packaging/+git/kubuntu-kldap:kubuntu_unstable
Merge into: ~kubuntu-packagers/kubuntu-packaging/+git/kldap:kubuntu_unstable
Diff against target: 27 lines (+5/-8)
1 file modified
debian/control (+5/-8)
Reviewer Review Type Date Requested Status
Kubuntu Packagers 2016-07-24 Pending
Review via email: mp+300998@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 b1b4bee..ca25861 100644
3--- a/debian/control
4+++ b/debian/control
5@@ -5,17 +5,14 @@ Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
6 Uploaders: Maximiliano Curia <maxy@debian.org>
7 Build-Depends: cmake (>= 2.8.12~),
8 debhelper (>= 9),
9- extra-cmake-modules (>= 5.14.0~),
10- kdoctools-dev,
11- kio-dev (>= 5.21.0~),
12- libkf5completion-dev (>= 5.12.0~),
13- libkf5i18n-dev (>= 5.12.0~),
14- libkf5mbox-dev,
15- libkf5widgetsaddons-dev (>= 5.12.0~),
16+ extra-cmake-modules (>= 5.24.0~),
17+ libkf5completion-dev (>= 5.24.0~),
18+ libkf5i18n-dev (>= 5.24.0~),
19+ libkf5widgetsaddons-dev (>= 5.24.0~),
20 libldap2-dev,
21 libsasl2-dev,
22 pkg-kde-tools (>> 0.15.15),
23- qtbase5-dev
24+ qtbase5-dev (>= 5.6.1~)
25 Standards-Version: 3.9.6
26 Homepage: https://projects.kde.org/projects/kde/pim/kldap
27 Vcs-Browser: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/kldap

Subscribers

People subscribed via source and target branches