Simon Quigley has proposed merging ~tsimonq2/kubuntu-packaging/+git/kubuntu-khelpcenter:kubuntu_unstable into ~kubuntu-packagers/kubuntu-packaging/+git/khelpcenter:kubuntu_unstable.
Requested reviews: Kubuntu Packagers (kubuntu-packagers) For more details, see: https://code.launchpad.net/~tsimonq2/kubuntu-packaging/+git/kubuntu-khelpcenter/+merge/300996 This change fixes the merge conflict in debian/control and merges the rest of the changes. (kubuntu_stable -> kubuntu_unstable) -- Your team Kubuntu Packagers is requested to review the proposed merge of ~tsimonq2/kubuntu-packaging/+git/kubuntu-khelpcenter:kubuntu_unstable into ~kubuntu-packagers/kubuntu-packaging/+git/khelpcenter:kubuntu_unstable.
diff --git a/debian/changelog b/debian/changelog index f2cb2cc..b932c13 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,6 +22,7 @@ khelpcenter (4:16.04.3-0ubuntu1) UNRELEASED; urgency=medium * Update VCS fields to point to Launchpad git repo * New upstream release 16.04.2 * New upstream release 16.04.3 + * Bump build deps -- Clive Johnston <[email protected]> Fri, 08 Jul 2016 17:05:36 +0100 diff --git a/debian/control b/debian/control index e4093db..812b12f 100644 --- a/debian/control +++ b/debian/control @@ -5,22 +5,26 @@ Maintainer: Debian/Kubuntu Qt/KDE Maintainers <[email protected]> Uploaders: Maximiliano Curia <[email protected]> Build-Depends: cmake (>= 2.8.12), debhelper (>= 9), - extra-cmake-modules (>= 5.18.0~), - kinit-dev (>= 5.18.0~), + extra-cmake-modules (>= 5.24.0~), + kdoctools-dev (>= 5.24.0~), + kinit-dev (>= 5.24.0~), libgrantlee5-dev, - libkf5bookmarks-dev, - libkf5config-dev (>= 5.18.0~), - libkf5coreaddons-dev (>= 5.18.0~), - libkf5dbusaddons-dev (>= 5.18.0~), - libkf5i18n-dev (>= 5.18.0~), - libkf5kcmutils-dev (>= 5.18.0~), - libkf5kdelibs4support-dev (>= 5.18.0~), - libkf5khtml-dev (>= 5.18.0~), - libkf5service-dev (>= 5.18.0~), + libkf5archive-dev (>= 5.24.0~), + libkf5bookmarks-dev (>= 5.24.0~), + libkf5config-dev (>= 5.24.0~), + libkf5coreaddons-dev (>= 5.24.0~), + libkf5dbusaddons-dev (>= 5.24.0~), + libkf5i18n-dev (>= 5.24.0~), + libkf5iconthemes-dev (>= 5.24.0~), + libkf5kcmutils-dev (>= 5.24.0~), + libkf5kdelibs4support-dev (>= 5.24.0~), + libkf5khtml-dev (>= 5.24.0~), + libkf5service-dev (>= 5.24.0~), + libkf5windowsystem-dev (>= 5.24.0~), libxapian-dev, libxml2-dev, pkg-kde-tools (>= 0.15.18~), - qtbase5-dev (>= 5.4.0~) + qtbase5-dev (>= 5.6.1~) Standards-Version: 3.9.8 Homepage: https://projects.kde.org/projects/kde/workspace/khelpcenter Vcs-Browser: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/khelpcenter
-- kubuntu-devel mailing list [email protected] Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel
