[sagemath] 01/01: Use maxima-sage Debian package.

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository sagemath.

commit 47f35704db93a455866e880eefe1e3bdb74cd5a1
Author: Tobias Hansen <thansen at broeselmaschine.fc.up.pt>
Date:   Sun Nov 13 16:51:30 2016 +0000

    Use maxima-sage Debian package.
---
 debian/control.in                  |  7 +++----
 debian/patches/debian-maxima.patch | 21 ++++++++++++++++-----
 debian/pruner/configure.ac         |  6 +++---
 3 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/debian/control.in b/debian/control.in
index 9265990..592e47e 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -84,10 +84,9 @@ Build-Depends:
  libsymmetrica-dev,
  libtachyon-dev,
  libzn-poly-dev,
- maxima (= 5.35.1-5sage2),
- maxima-doc (= 5.35.1-5sage2),
- maxima-ecl (= 5.35.1-5sage2),
- maxima-share (= 5.35.1-5sage2),
+ maxima-sage,
+ maxima-sage-doc,
+ maxima-sage-share,
  nauty,
  octave,
  palp (>= 2.1-2),
diff --git a/debian/patches/debian-maxima.patch b/debian/patches/debian-maxima.patch
index 808005e..6391d2a 100644
--- a/debian/patches/debian-maxima.patch
+++ b/debian/patches/debian-maxima.patch
@@ -16,7 +16,7 @@
                          name = 'maxima',
                          prompt = '\(\%i[0-9]+\) ',
 -                        command = 'maxima --userdir="%s" -p "%s"'%(SAGE_MAXIMA_DIR,STARTUP),
-+                        command = 'maxima -l ecl --userdir="%s" -p "%s"'%(SAGE_MAXIMA_DIR,STARTUP),
++                        command = 'maxima-sage --userdir="%s" -p "%s"'%(SAGE_MAXIMA_DIR,STARTUP),
                          script_subdirectory = script_subdirectory,
                          restart_on_ctrlc = False,
                          verbose_start = False,
@@ -36,7 +36,7 @@
              ...
          """
 -        cmd = 'maxima --very-quiet -r "%s(%s);" '%(command, s)
-+        cmd = 'maxima -l ecl --very-quiet -r "%s(%s);" '%(command, s)
++        cmd = 'maxima-sage --very-quiet -r "%s(%s);" '%(command, s)
          if sage.server.support.EMBEDDED_MODE:
              cmd += '< /dev/null'
  
@@ -57,7 +57,7 @@
          '5.35.1'
      """
 -    return os.popen('maxima --version').read().split()[-1]
-+    return os.popen('maxima -l ecl --version').read().split()[-1]
++    return os.popen('maxima-sage --version').read().split()[-1]
  
  def maxima_console():
      """
@@ -66,7 +66,7 @@
      if not get_display_manager().is_in_terminal():
          raise RuntimeError('Can use the console only in the terminal. Try %%maxima magics instead.')
 -    os.system('maxima')
-+    os.system('maxima -l ecl')
++    os.system('maxima-sage')
 --- a/sage/src/bin/sage
 +++ b/sage/src/bin/sage
 @@ -512,7 +512,7 @@
@@ -74,7 +74,18 @@
  if [ "$1" = '-maxima' -o "$1" = '--maxima' ]; then
      shift
 -    exec maxima "$@"
-+    exec maxima -l ecl "$@"
++    exec maxima-sage "$@"
  fi
  
  if [ "$1" = '-mwrank' -o "$1" = '--mwrank' ]; then
+--- a/sage/src/sage/interfaces/expect.py
++++ b/sage/src/sage/interfaces/expect.py
+@@ -563,7 +563,7 @@
+ 
+             sage: a = maxima('y')
+             sage: maxima.quit(verbose=True)
+-            Exiting Maxima with PID ... running .../bin/maxima ...
++            Exiting Maxima with PID ... running .../bin/maxima-sage ...
+             sage: a._check_valid()
+             Traceback (most recent call last):
+             ...
diff --git a/debian/pruner/configure.ac b/debian/pruner/configure.ac
index 35d8fd9..12e30fe 100644
--- a/debian/pruner/configure.ac
+++ b/debian/pruner/configure.ac
@@ -199,9 +199,9 @@ AC_SUBST(HAS_MATHJAX)
 
 # FIXME(maxima): needs quite special instructions to get it going
 HAS_MAXIMA="True"
-AC_CHECK_FILE(/usr/share/doc/maxima-share/copyright, , HAS_MAXIMA="False")
-AC_CHECK_FILE(/usr/share/doc/maxima-doc/copyright, , HAS_MAXIMA="False")
-AC_CHECK_FILE(/usr/share/doc/maxima/copyright, , HAS_MAXIMA="False")
+AC_CHECK_FILE(/usr/share/doc/maxima-sage-share/copyright, , HAS_MAXIMA="False")
+AC_CHECK_FILE(/usr/share/doc/maxima-sage-doc/copyright, , HAS_MAXIMA="False")
+AC_CHECK_FILE(/usr/share/doc/maxima-sage/copyright, , HAS_MAXIMA="False")
 AC_SUBST(HAS_MAXIMA)
 
 AC_CHECK_HEADERS(mpc.h, HAS_MPC="True", HAS_MPC="False")

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/sagemath.git