[sagemath] 04/06: Refresh remaining patches.

[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 a7d8065ba6c2c954e93ac8783441584d2b2a937a
Author: Tobias Hansen <thansen at debian.org>
Date:   Sat Jul 9 12:25:04 2016 +0000

    Refresh remaining patches.
---
 debian/patches/debian-maxima.patch       | 6 +++---
 debian/patches/debian-pari.patch         | 8 ++++----
 debian/patches/debian-singular.patch     | 4 ++--
 debian/patches/debian-temp-userdir.patch | 4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/debian/patches/debian-maxima.patch b/debian/patches/debian-maxima.patch
index 37d0dcb..a539282 100644
--- a/debian/patches/debian-maxima.patch
+++ b/debian/patches/debian-maxima.patch
@@ -22,7 +22,7 @@
  ecl_eval("(defvar *MAXIMA-LANG-SUBDIR* NIL)")
 --- a/sage/src/sage/interfaces/maxima.py
 +++ b/sage/src/sage/interfaces/maxima.py
-@@ -554,7 +554,7 @@
+@@ -555,7 +555,7 @@
          Expect.__init__(self,
                          name = 'maxima',
                          prompt = '\(\%i[0-9]+\) ',
@@ -42,7 +42,7 @@
          out = self._before()        # input echo + output prompt + output
 --- a/sage/src/sage/interfaces/maxima_abstract.py
 +++ b/sage/src/sage/interfaces/maxima_abstract.py
-@@ -163,7 +163,7 @@
+@@ -164,7 +164,7 @@
              -- Function: gcd (<p_1>, <p_2>, <x_1>, ...)
              ...
          """
@@ -51,7 +51,7 @@
          if sage.server.support.EMBEDDED_MODE:
              cmd += '< /dev/null'
  
-@@ -171,10 +171,7 @@
+@@ -172,10 +172,7 @@
              p = subprocess.Popen(cmd, shell=True, stdin=subprocess.PIPE,
                               stdout=subprocess.PIPE, stderr=subprocess.PIPE)
              res = p.stdout.read()
diff --git a/debian/patches/debian-pari.patch b/debian/patches/debian-pari.patch
index 6d9588e..46cad1e 100644
--- a/debian/patches/debian-pari.patch
+++ b/debian/patches/debian-pari.patch
@@ -11,11 +11,11 @@
 +GPHELP="/usr/bin/gphelp" && export GPHELP
 +GPDOCDIR="/usr/share/pari/doc" && export GPDOCDIR
  
- # Allow git to work without warning messages after relocating Sage.
- # See trac #15901.
+ SINGULARPATH="$SAGE_LOCAL/share/singular" && export SINGULARPATH
+ SINGULAR_EXECUTABLE="$SAGE_LOCAL/bin/Singular" && export SINGULAR_EXECUTABLE
 --- a/sage/src/sage/interfaces/gp.py
 +++ b/sage/src/sage/interfaces/gp.py
-@@ -244,9 +244,9 @@
+@@ -245,9 +245,9 @@
          # list of directories where gp will look for scripts (only current working directory)
          self._eval_line('default(path,".");')
          # location of elldata, seadata, galdata
@@ -27,7 +27,7 @@
          # logfile disabled since Expect already logs
          self._eval_line('default(log,0);')
          # set random seed
-@@ -525,7 +525,7 @@
+@@ -526,7 +526,7 @@
              sage: gp.get_default('log')
              0
              sage: gp.get_default('datadir')
diff --git a/debian/patches/debian-singular.patch b/debian/patches/debian-singular.patch
index e6058d2..06de510 100644
--- a/debian/patches/debian-singular.patch
+++ b/debian/patches/debian-singular.patch
@@ -1,6 +1,6 @@
 --- a/sage/src/bin/sage
 +++ b/sage/src/bin/sage
-@@ -459,7 +459,7 @@
+@@ -468,7 +468,7 @@
  
  if [ "$1" = '-singular' -o "$1" = '--singular' ]; then
      shift
@@ -22,7 +22,7 @@
      new_lookup = re.compile("\* ([^:]*):*([^.]*)\..*")
 --- a/sage/src/sage/libs/singular/singular.pyx
 +++ b/sage/src/sage/libs/singular/singular.pyx
-@@ -711,15 +711,13 @@
+@@ -710,15 +710,13 @@
  
      cdef void *handle = NULL
  
diff --git a/debian/patches/debian-temp-userdir.patch b/debian/patches/debian-temp-userdir.patch
index 9cff03c..13f22f1 100644
--- a/debian/patches/debian-temp-userdir.patch
+++ b/debian/patches/debian-temp-userdir.patch
@@ -71,7 +71,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  
  #########################################################
  ### Configuration
-@@ -595,6 +596,11 @@
+@@ -589,6 +590,11 @@
              'embedsignature': True,
              'profile': profile,
          })
@@ -83,7 +83,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  
      open(version_file, 'w').write(version_stamp)
  
-@@ -615,7 +621,7 @@
+@@ -609,7 +615,7 @@
  python_packages, python_modules = find_python_sources(
      SAGE_SRC, ['sage', 'sage_setup'])
  python_data_files = find_extra_files(python_packages,

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