[SCM] cantor packaging branch, master, updated. debian/15.08.3-1-20-ga548c7e

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 139b91d12b13c6f6bea561a6198db4c1deb95d72
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Sun Feb 28 09:17:25 2016 +0100

    Disable scilab support, (wait for #749833 to be fixed to reenable it).
---
 debian/changelog |  2 ++
 debian/control   | 30 +++++++++++++++---------------
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 845d243..7965c55 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 cantor (4:15.12.2-1~) UNRELEASED; urgency=medium
 
   * New upstream release (15.12.2).
+  * Disable scilab support, (wait for #749833 to be fixed to reenable
+    it).
 
  -- Maximiliano Curia <maxy at debian.org>  Sat, 13 Feb 2016 09:43:52 +0100
 
diff --git a/debian/control b/debian/control
index da234a0..7076cd4 100644
--- a/debian/control
+++ b/debian/control
@@ -54,7 +54,7 @@ Suggests: cantor-backend-kalgebra,
           cantor-backend-python3,
           cantor-backend-r,
           cantor-backend-sage,
-          cantor-backend-scilab [amd64 arm64 armel armhf i386 mips mipsel powerpc ppc64el s390x]
+#          cantor-backend-scilab [amd64 arm64 armel armhf i386 mips mipsel powerpc ppc64el s390x]
 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
@@ -247,20 +247,20 @@ Description: Sage backend for Cantor
  .
  This package is part of the KDE education module.
 
-Package: cantor-backend-scilab
-Architecture: amd64 arm64 armel armhf i386 mips mipsel powerpc ppc64el s390x
-Section: math
-Depends: scilab-cli, ${misc:Depends}, ${shlibs:Depends}
-Description: Scilab 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 the Scilab scientific software
- package for numerical computations (http://www.scilab.org) in Cantor.
- .
- This package is part of the KDE education module.
+# Package: cantor-backend-scilab
+# Architecture: amd64 arm64 armel armhf i386 mips mipsel powerpc ppc64el s390x
+# Section: math
+# Depends: scilab-cli, ${misc:Depends}, ${shlibs:Depends}
+# Description: Scilab 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 the Scilab scientific software
+#  package for numerical computations (http://www.scilab.org) in Cantor.
+#  .
+#  This package is part of the KDE education module.
 
 Package: cantor-backend-lua
 Architecture: amd64 i386

-- 
cantor packaging