[SCM] cantor packaging branch, kubuntu_vivid_archive, updated. debian/4.14.2-2-8-g08e6985

[Jonathan Riddell]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-applications/cantor.git;a=commitdiff;h=08e6985

The following commit has been merged in the kubuntu_vivid_archive branch:
commit 08e6985a6dd37dc88161a0575b9ec0c58ee6981a
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Tue Dec 9 17:29:26 2014 +0100

    Remove kalgebra backend, needs porting to Qt 5 for new libanalitza
---
 debian/changelog |  7 ++++++-
 debian/control   | 32 ++++++++++++++++----------------
 2 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 056d2ac..e79e62b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cantor (4:14.11.97-0ubuntu2) vivid; urgency=medium
+
+  * Remove kalgebra backend, needs porting to Qt 5 for new libanalitza
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 09 Dec 2014 17:27:35 +0100
+
 cantor (4:14.11.97-0ubuntu1) vivid; urgency=medium
 
   [ Scarlett Clark ]
@@ -5,7 +11,6 @@ cantor (4:14.11.97-0ubuntu1) vivid; urgency=medium
 
   [ Jonathan Riddell ]
   * Tidy up debian/copyright
-  * PPA build
 
  -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 03 Dec 2014 11:52:32 +0100
 
diff --git a/debian/control b/debian/control
index d09a1bf..4ab6a4e 100644
--- a/debian/control
+++ b/debian/control
@@ -28,7 +28,7 @@ Package: cantor
 Architecture: any
 Section: math
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Recommends: cantor-backend-kalgebra, texlive-binaries, texlive-latex-base
+Recommends: cantor-backend-qalculate, texlive-binaries, texlive-latex-base
 Suggests: cantor-backend-lua [i386 amd64],
           cantor-backend-maxima,
           cantor-backend-octave,
@@ -45,7 +45,6 @@ Description: interface for mathematical applications
  .
  Cantor supports various mathematical applications as backends (provided in
  external packages):
-  * KAlgebra (cantor-backend-kalgebra)
   * Maxima Computer Algebra System (cantor-backend-maxima)
   * R Project for Statistical Computing (cantor-backend-r)
   * Sage Mathematics Software (cantor-backend-sage)
@@ -57,20 +56,21 @@ Description: interface for mathematical applications
  .
  This package is part of the KDE education module.
 
-Package: cantor-backend-kalgebra
-Architecture: any
-Section: math
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: KAlgebra backend for Cantor
- 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.
- .
- This package provides the backend for using KAlgebra
- (http://edu.kde.org/kalgebra) in Cantor.
- .
- This package is part of the KDE education module.
+# Need ported to Qt 5 for new libanalitza
+#Package: cantor-backend-kalgebra
+#Architecture: any
+#Section: math
+#Depends: ${misc:Depends}, ${shlibs:Depends}
+#Description: KAlgebra backend for Cantor
+# 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.
+# .
+# This package provides the backend for using KAlgebra
+# (http://edu.kde.org/kalgebra) in Cantor.
+# .
+# This package is part of the KDE education module.
 
 Package: cantor-backend-maxima
 Architecture: any

-- 
cantor packaging