Simon Quigley has proposed merging ~tsimonq2/kubuntu-packaging/+git/kubuntu-rocs:kubuntu_unstable into ~kubuntu-packagers/kubuntu-packaging/+git/rocs:kubuntu_unstable.
Requested reviews: Kubuntu Packagers (kubuntu-packagers) For more details, see: https://code.launchpad.net/~tsimonq2/kubuntu-packaging/+git/kubuntu-rocs/+merge/300987 This fixes the merge errors that were happening due to some dependency conflicts in debian/control. -- Your team Kubuntu Packagers is requested to review the proposed merge of ~tsimonq2/kubuntu-packaging/+git/kubuntu-rocs:kubuntu_unstable into ~kubuntu-packagers/kubuntu-packaging/+git/rocs:kubuntu_unstable.
diff --git a/debian/control b/debian/control index a84bd29..2d616e5 100644 --- a/debian/control +++ b/debian/control @@ -7,28 +7,28 @@ Uploaders: Eshat Cakar <[email protected]>, Maximiliano Curia <[email protected]> Build-Depends: cmake (>= 3.0.0~), debhelper (>= 9), - extra-cmake-modules (>= 1.7.0~), - kdoctools-dev (>= 5.7~), + extra-cmake-modules (>= 5.24.0~), + kdoctools-dev (>= 5.24.0~), kio-dev, libboost-dev (>= 1.49~), libboost-graph-dev, libgrantlee5-dev (>= 5.0.0~), - libkf5archive-dev (>= 5.7~), - libkf5config-dev (>= 5.7~), - libkf5coreaddons-dev (>= 5.7~), - libkf5crash-dev (>= 5.7~), - libkf5declarative-dev (>= 5.7~), - libkf5i18n-dev (>= 5.7~), - libkf5itemviews-dev (>= 5.7~), - libkf5texteditor-dev (>= 5.7~), - libkf5xmlgui-dev (>= 5.7~), - libqt5svg5-dev (>= 5.4), + libkf5archive-dev (>= 5.24.0~), + libkf5config-dev (>= 5.24.0~), + libkf5coreaddons-dev (>= 5.24.0~), + libkf5crash-dev (>= 5.24.0~), + libkf5declarative-dev (>= 5.24.0~), + libkf5i18n-dev (>= 5.24.0~), + libkf5itemviews-dev (>= 5.24.0~), + libkf5texteditor-dev (>= 5.24.0~), + libkf5xmlgui-dev (>= 5.24.0~), + libqt5svg5-dev (>= 5.6.1~), libqt5webkit5-dev (>= 5.4), - libqt5xmlpatterns5-dev (>= 5.4), + libqt5xmlpatterns5-dev (>= 5.6.1~), pkg-kde-tools (>> 0.15.15), - qtbase5-dev (>= 5.4), - qtdeclarative5-dev (>= 5.4), - qtscript5-dev (>= 5.4) + qtbase5-dev (>= 5.6.1~), + qtdeclarative5-dev (>= 5.6.1~), + qtscript5-dev (>= 5.6.1~) Standards-Version: 3.9.6 Homepage: https://projects.kde.org/projects/kde/kdeedu/rocs Vcs-Git: git://git.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/rocs
-- kubuntu-devel mailing list [email protected] Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel
