[sagemath] 08/09: Refresh more 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 023a253c50298fcc968b12a1e69a5e6c6b96df47
Author: Tobias Hansen <thansen at localhost.localdomain>
Date:   Thu Apr 7 10:35:10 2016 +0100

    Refresh more patches.
---
 debian/patches/pari.patch                       | 32 ++++++++++++-------------
 debian/patches/python_installs_in_userdir.patch | 16 ++++++-------
 debian/patches/rubiks_executables_renames.patch |  6 ++---
 3 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/debian/patches/pari.patch b/debian/patches/pari.patch
index c91620a..6d9588e 100644
--- a/debian/patches/pari.patch
+++ b/debian/patches/pari.patch
@@ -1,6 +1,6 @@
 --- a/sage/src/bin/sage-env
 +++ b/sage/src/bin/sage-env
-@@ -300,9 +300,9 @@
+@@ -309,9 +309,9 @@
  fi
  
  # For PARI/GP
@@ -15,7 +15,7 @@
  # See trac #15901.
 --- a/sage/src/sage/interfaces/gp.py
 +++ b/sage/src/sage/interfaces/gp.py
-@@ -222,9 +222,9 @@
+@@ -244,9 +244,9 @@
          # list of directories where gp will look for scripts (only current working directory)
          self._eval_line('default(path,".");')
          # location of elldata, seadata, galdata
@@ -26,8 +26,8 @@
 +        self._eval_line('default(help, "/usr/bin/gphelp -detex");')
          # logfile disabled since Expect already logs
          self._eval_line('default(log,0);')
- 
-@@ -501,7 +501,7 @@
+         # set random seed
+@@ -525,7 +525,7 @@
              sage: gp.get_default('log')
              0
              sage: gp.get_default('datadir')
@@ -36,19 +36,9 @@
              sage: gp.get_default('seriesprecision')
              16
              sage: gp.get_default('realprecision')
---- a/sage/src/sage/libs/pari/decl.pxi
-+++ b/sage/src/sage/libs/pari/decl.pxi
-@@ -4266,5 +4266,5 @@
- 
-     extern gp_data* GP_DATA
- 
--cdef extern from 'pari/anal.h':
--    char* closure_func_err()
-+#cdef extern from 'pari/anal.h':
-+cdef extern char* closure_func_err()
 --- a/sage/src/Makefile
 +++ b/sage/src/Makefile
-@@ -24,7 +24,7 @@
+@@ -14,7 +14,7 @@
  
  
  # Auto-generated files
@@ -68,4 +58,14 @@
 +    return os.path.join("/usr", "share", "pari")
  
  paren_re = re.compile(r"[(](.*)[)]")
- argname_re = re.compile(r"[ {]*([A-Za-z0-9_]+)")
+ argname_re = re.compile(r"[ {]*([A-Za-z_][A-Za-z0-9_]*)")
+--- a/sage/src/sage/libs/pari/paripriv.pxd
++++ b/sage/src/sage/libs/pari/paripriv.pxd
+@@ -26,5 +26,5 @@
+ 
+     extern gp_data* GP_DATA
+ 
+-cdef extern from "pari/anal.h":
+-    char* closure_func_err()
++#cdef extern from 'pari/anal.h':
++cdef extern char* closure_func_err()
diff --git a/debian/patches/python_installs_in_userdir.patch b/debian/patches/python_installs_in_userdir.patch
index f4b4243..b99c297 100644
--- a/debian/patches/python_installs_in_userdir.patch
+++ b/debian/patches/python_installs_in_userdir.patch
@@ -1,6 +1,6 @@
 --- a/sage/build/pkgs/sagenb/spkg-install
 +++ b/sage/build/pkgs/sagenb/spkg-install
-@@ -46,7 +46,7 @@
+@@ -51,7 +51,7 @@
  
  # Install dependencies
  for PKG in $(cat src/install_order); do
@@ -9,7 +9,7 @@
      if [ $? -ne 0 ]; then
          echo >&2 "Error: Installing $PKG failed."
          exit 1
-@@ -56,7 +56,7 @@
+@@ -61,7 +61,7 @@
  
  # Install sagenb into site-packages
  PKG=$(ls -1 src | GREP_OPTIONS= grep sagenb-)
@@ -20,12 +20,12 @@
      exit 1
 --- a/sage/src/Makefile
 +++ b/sage/src/Makefile
-@@ -6,7 +6,7 @@
- 	$(MAKE) sage
+@@ -3,7 +3,7 @@
+ all: sage
  
  sage: sage/libs/pari/auto_gen.pxi sage/ext/interpreters/__init__.py
--	python setup.py install
-+	python setup.py install --user
+-	python -u setup.py install
++	python -u setup.py install --user
  
- csage:
- 	cd c_lib && scons -Q install
+ clean:
+ 	@echo "Deleting Sage library build artifacts..."
diff --git a/debian/patches/rubiks_executables_renames.patch b/debian/patches/rubiks_executables_renames.patch
index 4acc8f0..d5578f1 100644
--- a/debian/patches/rubiks_executables_renames.patch
+++ b/debian/patches/rubiks_executables_renames.patch
@@ -1,6 +1,6 @@
 --- a/sage/src/sage/interfaces/rubik.py
 +++ b/sage/src/sage/interfaces/rubik.py
-@@ -87,7 +87,7 @@
+@@ -88,7 +88,7 @@
      """
      Interface to Michael Reid's optimal Rubik's Cube solver.
      """
@@ -9,7 +9,7 @@
  
      def __init__(self, verbose=False, wait=True):
          self.verbose = verbose
-@@ -175,7 +175,7 @@
+@@ -176,7 +176,7 @@
  
  class CubexSolver:
  
@@ -18,7 +18,7 @@
  
      def __call__(self, facets):
          return self.solve(facets)
-@@ -229,7 +229,7 @@
+@@ -230,7 +230,7 @@
  
  class DikSolver:
  

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