Simon Quigley has proposed merging ~tsimonq2/kubuntu-packaging/+git/kubuntu-cantor:kubuntu_unstable into ~kubuntu-packagers/kubuntu-packaging/+git/cantor:kubuntu_unstable.
Requested reviews: Kubuntu Packagers (kubuntu-packagers) For more details, see: https://code.launchpad.net/~tsimonq2/kubuntu-packaging/+git/kubuntu-cantor/+merge/300990 This fixes the merge conflict in the debian/control file. (kubuntu_stable -> kubuntu_unstable) -- Your team Kubuntu Packagers is requested to review the proposed merge of ~tsimonq2/kubuntu-packaging/+git/kubuntu-cantor:kubuntu_unstable into ~kubuntu-packagers/kubuntu-packaging/+git/cantor:kubuntu_unstable.
diff --git a/debian/control b/debian/control index 9410894..9b7f889 100644 --- a/debian/control +++ b/debian/control @@ -5,38 +5,38 @@ Maintainer: Debian/Kubuntu Qt/KDE Maintainers <[email protected]> Uploaders: Sune Vuorela <[email protected]>, Maximiliano Curia <[email protected]> Build-Depends: cmake (>= 2.8.12~), debhelper (>= 9), - extra-cmake-modules (>= 1.7.0~), - kdoctools-dev, - kio-dev, - libanalitza-dev (>> 4:15.08), + extra-cmake-modules (>= 5.24.0~), + kdoctools-dev (>= 5.24.0~), + kio-dev (>= 5.24.0~), + libanalitza-dev (>= 4:16.04.3~), libglib2.0-dev, - libkf5archive-dev (>= 5.21.0~), - libkf5completion-dev (>= 5.21.0~), - libkf5config-dev (>= 5.21.0~), - libkf5coreaddons-dev (>= 5.21.0~), - libkf5crash-dev (>= 5.21.0~), - libkf5i18n-dev (>= 5.21.0~), - libkf5iconthemes-dev (>= 5.21.0~), - libkf5kdelibs4support-dev (>= 5.21.0~), - libkf5newstuff-dev (>= 5.21.0~), - libkf5parts-dev (>= 5.21.0~), - libkf5pty-dev (>= 5.21.0~), - libkf5texteditor-dev (>= 5.21.0~), - libkf5textwidgets-dev (>= 5.21.0~), - libkf5unitconversion-dev (>= 5.21.0~), - libkf5widgetsaddons-dev (>= 5.21.0~), - libkf5windowsystem-dev (>= 5.21.0~), - libkf5xmlgui-dev (>= 5.21.0~), - libluajit-5.1-dev [i386 amd64], + libkf5archive-dev (>= 5.24.0~), + libkf5completion-dev (>= 5.24.0~), + libkf5config-dev (>= 5.24.0~), + libkf5coreaddons-dev (>= 5.24.0~), + libkf5crash-dev (>= 5.24.0~), + libkf5i18n-dev (>= 5.24.0~), + libkf5iconthemes-dev (>= 5.24.0~), + libkf5kdelibs4support-dev (>= 5.24.0~), + libkf5newstuff-dev (>= 5.24.0~), + libkf5parts-dev (>= 5.24.0~), + libkf5pty-dev (>= 5.24.0~), + libkf5texteditor-dev (>= 5.24.0~), + libkf5textwidgets-dev (>= 5.24.0~), + libkf5unitconversion-dev (>= 5.24.0~), + libkf5widgetsaddons-dev (>= 5.24.0~), + libkf5windowsystem-dev (>= 5.24.0~), + libkf5xmlgui-dev (>= 5.24.0~), + libluajit-5.1-dev [i386 amd64], libqalculate-dev, - libqt5svg5-dev (>= 5.4), - libqt5xmlpatterns5-dev (>= 5.4), + libqt5svg5-dev (>= 5.6.1~), + libqt5xmlpatterns5-dev (>= 5.6.1~), libspectre-dev, pkg-config, pkg-kde-tools (>> 0.15.15), python-dev (>= 2.7~), python3-dev, - qtbase5-dev (>= 5.4), + qtbase5-dev (>= 5.6.1~), r-base-core Standards-Version: 3.9.7 Homepage: http://edu.kde.org/ @@ -55,25 +55,7 @@ Suggests: cantor-backend-kalgebra, cantor-backend-python2, cantor-backend-python3, cantor-backend-r, - cantor-backend-sage -Description: interface for mathematical applications - Cantor is an application to allow you to you use your favorite mathematical - applications from within an elegant worksheet interface. It provides dialogs - to assist with common tasks and allows you to share your worksheets - with others. - . - Cantor supports various mathematical applications as backends (provided in - external packages): - * Maxima Computer Algebra System (cantor-backend-maxima) - * R Project for Statistical Computing (cantor-backend-r) - * Sage Mathematics Software (cantor-backend-sage) - * Octave (cantor-backend-octave) - * Python (cantor-backend-python2 and cantor-backend-python3) - * Scilab (cantor-backend-scilab) - * Qalculate! (cantor-backend-qalculate) - * Lua (cantor-backend-lua) - . - This package is part of the KDE education module. + cantor-backend-sage, Package: cantor-dev Architecture: any
-- kubuntu-devel mailing list [email protected] Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel
