[sagemath] 07/14: Refresh more patches.
Tobias Hansen
thansen at moszumanska.debian.org
Tue Oct 25 00:51:25 UTC 2016
This is an automated email from the git hooks/post-receive script.
thansen pushed a commit to branch sage-7.4
in repository sagemath.
commit 7e072d2462c02d5602d6347230178f2c117b90da
Author: Tobias Hansen <thansen at broeselmaschine.fc.up.pt>
Date: Mon Oct 24 23:43:47 2016 +0000
Refresh more patches.
---
debian/patches/debian-arb.patch | 6 ++--
debian/patches/debian-cython-sys-path.patch | 4 +--
debian/patches/debian-gsl-cblas.patch | 2 +-
debian/patches/debian-libgap-sage.patch | 6 ++--
debian/patches/debian-maxima.patch | 17 ++--------
debian/patches/debian-nauty.patch | 2 +-
debian/patches/debian-octave.patch | 17 ----------
debian/patches/debian-pari.patch | 24 +++++++-------
debian/patches/debian-paths.patch | 26 ++++++---------
debian/patches/debian-singular.patch | 50 ++++++++---------------------
debian/patches/series | 1 -
11 files changed, 48 insertions(+), 107 deletions(-)
diff --git a/debian/patches/debian-arb.patch b/debian/patches/debian-arb.patch
index 5de66e7..3f558ec 100644
--- a/debian/patches/debian-arb.patch
+++ b/debian/patches/debian-arb.patch
@@ -10,12 +10,12 @@ Forwarded: not-needed
"ec", "ecm",
] + linbox_libs + gsl_libs + [
"pari", "flint", "ratpoints", "ecl", "glpk", "ppl",
-- "arb", "fplll", "mpfi", "mpfr", "mpc", "gmp", "gmpxx",
-+ "flint-arb", "fplll", "mpfi", "mpfr", "mpc", "gmp", "gmpxx",
+- "arb", "mpfi", "mpfr", "mpc", "gmp", "gmpxx",
++ "flint-arb", "mpfi", "mpfr", "mpc", "gmp", "gmpxx",
"brial",
"brial_groebner",
"m4rie",
-@@ -871,7 +871,7 @@
+@@ -866,7 +866,7 @@
Extension("sage.matrix.matrix_complex_ball_dense",
["sage/matrix/matrix_complex_ball_dense.pyx"],
diff --git a/debian/patches/debian-cython-sys-path.patch b/debian/patches/debian-cython-sys-path.patch
index 092df11..8775d46 100644
--- a/debian/patches/debian-cython-sys-path.patch
+++ b/debian/patches/debian-cython-sys-path.patch
@@ -5,7 +5,7 @@ Origin: https://git.archlinux.org/svntogit/community.git/tree/trunk?h=packages/s
--- a/sage/src/setup.py
+++ b/sage/src/setup.py
-@@ -590,6 +590,7 @@
+@@ -613,6 +613,7 @@
build_dir=SAGE_CYTHONIZED,
force=force,
aliases=aliases,
@@ -15,7 +15,7 @@ Origin: https://git.archlinux.org/svntogit/community.git/tree/trunk?h=packages/s
'profile': profile,
--- a/sage/src/sage/misc/cython.py
+++ b/sage/src/sage/misc/cython.py
-@@ -239,6 +239,7 @@
+@@ -242,6 +242,7 @@
# Add cysignals directory to includes
for path in sys.path:
diff --git a/debian/patches/debian-gsl-cblas.patch b/debian/patches/debian-gsl-cblas.patch
index 0e1eb0d..e4ff732 100644
--- a/debian/patches/debian-gsl-cblas.patch
+++ b/debian/patches/debian-gsl-cblas.patch
@@ -23,7 +23,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
if os.path.exists('/usr/lib/libblas.dll.a'):
--- a/sage/src/sage/misc/cython.py
+++ b/sage/src/sage/misc/cython.py
-@@ -27,17 +27,16 @@
+@@ -30,17 +30,16 @@
# CBLAS can be one of multiple implementations
diff --git a/debian/patches/debian-libgap-sage.patch b/debian/patches/debian-libgap-sage.patch
index efcd34d..730d3bc 100644
--- a/debian/patches/debian-libgap-sage.patch
+++ b/debian/patches/debian-libgap-sage.patch
@@ -56,7 +56,7 @@ Forwarded: not-needed
"m", "readline", "Lfunction" ,
] + cblas_libs + [
"cryptominisat",
-@@ -715,15 +719,15 @@
+@@ -710,15 +714,15 @@
Extension('sage.libs.gap.util',
sources = ["sage/libs/gap/util.pyx"],
@@ -77,7 +77,7 @@ Forwarded: not-needed
##
--- a/sage/src/setup.py
+++ b/sage/src/setup.py
-@@ -160,6 +160,12 @@
+@@ -183,6 +183,12 @@
"ntl": [ os.path.join(SAGE_INC, 'NTL', 'config.h') ]
}
@@ -90,7 +90,7 @@ Forwarded: not-needed
# In the loop below, don't append to any list, since many of these
# lists are actually identical Python objects. For every list, we need
# to write (at least the first time):
-@@ -177,8 +183,8 @@
+@@ -200,8 +206,8 @@
m.extra_compile_args = m.extra_compile_args + extra_compile_args
m.extra_link_args = m.extra_link_args + extra_link_args
diff --git a/debian/patches/debian-maxima.patch b/debian/patches/debian-maxima.patch
index 57b0e36..808005e 100644
--- a/debian/patches/debian-maxima.patch
+++ b/debian/patches/debian-maxima.patch
@@ -1,14 +1,3 @@
---- a/sage/src/doc/en/constructions/plotting.rst
-+++ b/sage/src/doc/en/constructions/plotting.rst
-@@ -214,7 +214,7 @@
- ::
-
- sage: maxima.eval('load("plotdf");')
-- '".../local/share/maxima/.../share/dynamics/plotdf.lisp"'
-+ '".../share/maxima/.../share/dynamics/plotdf.lisp"'
- sage: maxima.eval('plotdf(x+y,[trajectory_at,2,-0.1]); ') # not tested
-
- This plots a direction field (the plotdf Maxima package was also
--- a/sage/src/sage/interfaces/maxima_lib.py
+++ b/sage/src/sage/interfaces/maxima_lib.py
@@ -98,7 +98,7 @@
@@ -63,7 +52,7 @@
return AsciiArtString(res)
else:
subprocess.Popen(cmd, shell=True)
-@@ -2357,7 +2354,7 @@
+@@ -2215,7 +2212,7 @@
sage: maxima_version()
'5.35.1'
"""
@@ -72,7 +61,7 @@
def maxima_console():
"""
-@@ -2373,4 +2370,4 @@
+@@ -2231,4 +2228,4 @@
from sage.repl.rich_output.display_manager import get_display_manager
if not get_display_manager().is_in_terminal():
raise RuntimeError('Can use the console only in the terminal. Try %%maxima magics instead.')
@@ -80,7 +69,7 @@
+ os.system('maxima -l ecl')
--- a/sage/src/bin/sage
+++ b/sage/src/bin/sage
-@@ -507,7 +507,7 @@
+@@ -512,7 +512,7 @@
if [ "$1" = '-maxima' -o "$1" = '--maxima' ]; then
shift
diff --git a/debian/patches/debian-nauty.patch b/debian/patches/debian-nauty.patch
index 53d6307..aaa2cbb 100644
--- a/debian/patches/debian-nauty.patch
+++ b/debian/patches/debian-nauty.patch
@@ -1,6 +1,6 @@
--- a/sage/src/sage/graphs/digraph_generators.py
+++ b/sage/src/sage/graphs/digraph_generators.py
-@@ -483,7 +483,7 @@
+@@ -484,7 +484,7 @@
nauty_input += " "+str(n) +" "
diff --git a/debian/patches/debian-octave.patch b/debian/patches/debian-octave.patch
deleted file mode 100644
index 4544b3c..0000000
--- a/debian/patches/debian-octave.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Fix octave path for Debian
- In Debian we want octave-cli; octave is the gui
-Author: Ximin Luo <infinity0 at debian.org>
-Forwarded: not-needed
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/sage/src/sage/interfaces/octave.py
-+++ b/sage/src/sage/interfaces/octave.py
-@@ -184,7 +184,7 @@
- Expect.__init__(self,
- name = 'octave',
- prompt = '>',
-- command = "sage-native-execute octave --no-line-editing --silent",
-+ command = "sage-native-execute octave-cli --no-line-editing --silent",
- server = server,
- server_tmpdir = server_tmpdir,
- script_subdirectory = script_subdirectory,
diff --git a/debian/patches/debian-pari.patch b/debian/patches/debian-pari.patch
index 9d1ba3f..debf040 100644
--- a/debian/patches/debian-pari.patch
+++ b/debian/patches/debian-pari.patch
@@ -12,22 +12,11 @@
# logfile disabled since Expect already logs
self._eval_line('default(log,0);')
# set random seed
---- a/sage/src/Makefile
-+++ b/sage/src/Makefile
-@@ -14,7 +14,7 @@
-
-
- # Auto-generated files
--sage/libs/pari/auto_gen.pxi: $(SAGE_LOCAL)/share/pari/pari.desc \
-+sage/libs/pari/auto_gen.pxi: /usr/share/pari/pari.desc \
- sage/libs/pari/decl.pxi sage_setup/autogen/pari/*.py
- python -c "from sage_setup.autogen.pari import rebuild; rebuild()"
-
--- a/sage/src/sage_setup/autogen/pari/parser.py
+++ b/sage/src/sage_setup/autogen/pari/parser.py
@@ -43,8 +43,7 @@
sage: pari_share()
- '.../local/share/pari'
+ '.../share/pari'
"""
- SAGE_LOCAL = os.environ["SAGE_LOCAL"]
- return os.path.join(SAGE_LOCAL, "share", "pari")
@@ -45,3 +34,14 @@
- char* closure_func_err()
+#cdef extern from 'pari/anal.h':
+cdef extern char* closure_func_err()
+--- a/sage/src/generate_py_source.mk
++++ b/sage/src/generate_py_source.mk
+@@ -5,7 +5,7 @@
+
+ # Auto-generated files
+ # TODO: Adjustments for VPATH builds will be necessary.
+-sage/libs/pari/auto_gen.pxi: $(SAGE_LOCAL)/share/pari/pari.desc \
++sage/libs/pari/auto_gen.pxi: /usr/share/pari/pari.desc \
+ sage/libs/pari/decl.pxi sage_setup/autogen/pari/*.py
+ python -c "from sage_setup.autogen.pari import rebuild; rebuild()"
+
diff --git a/debian/patches/debian-paths.patch b/debian/patches/debian-paths.patch
index fa23abd..ec79004 100644
--- a/debian/patches/debian-paths.patch
+++ b/debian/patches/debian-paths.patch
@@ -20,7 +20,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
sage: len(r), len(w), len(x), t
--- a/sage/src/bin/sage-env
+++ b/sage/src/bin/sage-env
-@@ -315,12 +315,12 @@
+@@ -325,12 +325,12 @@
fi
# For PARI/GP
@@ -38,15 +38,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
if [ -z "$SAGE_REPO_ANONYMOUS" ]; then
SAGE_REPO_ANONYMOUS="git://trac.sagemath.org/sage.git"
-@@ -445,7 +445,6 @@
- fi
- fi
- fi
--MAXIMA_PREFIX="$SAGE_ROOT/local" && export MAXIMA_PREFIX
-
- PERL5LIB="$SAGE_LOCAL/lib/perl5:$PERL5LIB" && export PERL5LIB
-
-@@ -614,9 +613,6 @@
+@@ -642,9 +642,6 @@
LD_LIBRARY_PATH="$SAGE_LOCAL/bin:$LD_LIBRARY_PATH" && export LD_LIBRARY_PATH
fi
@@ -80,7 +72,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
print('The gap-4.5.5.spkg (or later) seems to be not installed!')
--- a/sage/src/sage/misc/cython.py
+++ b/sage/src/sage/misc/cython.py
-@@ -410,7 +410,7 @@
+@@ -413,7 +413,7 @@
file_list = []
for fname in additional_source_files:
fname = fname.replace("$SAGE_SRC", SAGE_SRC)
@@ -170,8 +162,8 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/sage/src/sage/databases/conway.py
+++ b/sage/src/sage/databases/conway.py
-@@ -20,9 +20,8 @@
- #*****************************************************************************
+@@ -22,9 +22,8 @@
+ from six import itervalues
import collections, os
-from sage.env import SAGE_SHARE
@@ -198,7 +190,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
_cremonaSkeleton = {
't_class': {
'conductor': {'sql':'INTEGER', 'index':True},
-@@ -1667,8 +1668,7 @@
+@@ -1663,8 +1664,7 @@
Traceback (most recent call last):
...
ValueError: Desired database (='should not exist') does not exist
@@ -222,7 +214,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
return []
--- a/sage/src/sage/graphs/isgci.py
+++ b/sage/src/sage/graphs/isgci.py
-@@ -374,7 +374,8 @@
+@@ -376,7 +376,8 @@
from sage.structure.sage_object import SageObject
from sage.structure.unique_representation import CachedRepresentation, UniqueRepresentation
from sage.misc.unknown import Unknown
@@ -232,7 +224,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
#*****************************************************************************
# Copyright (C) 2011 Nathann Cohen <nathann.cohen at gmail.com>
-@@ -833,8 +834,7 @@
+@@ -835,8 +836,7 @@
EXAMPLE::
@@ -244,7 +236,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
import os.path
--- a/sage/src/sage/graphs/strongly_regular_db.pyx
+++ b/sage/src/sage/graphs/strongly_regular_db.pyx
-@@ -3118,8 +3118,7 @@
+@@ -3120,8 +3120,7 @@
return
import json
diff --git a/debian/patches/debian-singular.patch b/debian/patches/debian-singular.patch
index 3328d45..888904a 100644
--- a/debian/patches/debian-singular.patch
+++ b/debian/patches/debian-singular.patch
@@ -4,24 +4,13 @@ Author: Ximin Luo <infinity0 at debian.org>
Forwarded: not-needed
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/sage/src/bin/sage
-+++ b/sage/src/bin/sage
-@@ -467,7 +467,7 @@
-
- if [ "$1" = '-singular' -o "$1" = '--singular' ]; then
- shift
-- exec singular "$@"
-+ exec Singular "$@"
- fi
-
- if [ "$1" = '-sqlite3' -o "$1" = '--sqlite3' ]; then
--- a/sage/src/sage/interfaces/singular.py
+++ b/sage/src/sage/interfaces/singular.py
-@@ -2272,7 +2272,7 @@
+@@ -2283,7 +2283,7 @@
nodes.clear()
node_names.clear()
-- singular_docdir = os.environ["SAGE_LOCAL"]+"/share/singular/"
+- singular_docdir = SAGE_LOCAL+"/share/singular/"
+ singular_docdir = "/usr/share/doc/singular-doc/"
new_node = re.compile("File: singular\.hlp, Node: ([^,]*),.*")
@@ -36,39 +25,28 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
from libc.stdint cimport int64_t
from sage.libs.singular.decl cimport *
-@@ -771,7 +772,7 @@
+@@ -772,7 +773,7 @@
extension = "so"
# library name changed from libsingular to libSingular btw 3.x and 4.x
-- lib = os.environ['SAGE_LOCAL']+"/lib/libSingular."+extension
+- lib = SAGE_LOCAL+"/lib/libSingular."+extension
+ lib = "/usr/lib/%s/libsingular-Singular.so" % sysconfig.get_config_var('MULTIARCH')
if not os.path.exists(lib):
raise ImportError("cannot locate Singular library ({})".format(lib))
--- a/sage/src/sage/misc/cython.py
+++ b/sage/src/sage/misc/cython.py
-@@ -304,10 +304,10 @@
- Before :trac:`12975`, it would have beeen needed to write ``#clang c++``,
+@@ -307,10 +307,10 @@
+ Before :trac:`12975`, it would have been needed to write ``#clang c++``,
but upper case ``C++`` has resulted in an error::
- sage: code = [
+ sage: import sysconfig; code = [
- ... "#clang C++",
-- ... "#cinclude %s/include/singular %s/include/factory"%(SAGE_LOCAL, SAGE_LOCAL),
-- ... "#clib m readline Singular givaro ntl gmpxx gmp",
-+ ... "#cinclude /usr/include/singular /usr/include/singular/singular /usr/include/{0}/singular /usr/include/{0}/singular/singular".format(sysconfig.get_config_var('MULTIARCH')),
-+ ... "#clib m readline singular-Singular givaro ntl gmpxx gmp",
- ... "from sage.rings.polynomial.multi_polynomial_libsingular cimport MPolynomial_libsingular",
- ... "from sage.libs.singular.polynomial cimport singular_polynomial_pow",
- ... "def test(MPolynomial_libsingular p):",
---- a/sage/src/sage/interfaces/tests.py
-+++ b/sage/src/sage/interfaces/tests.py
-@@ -39,7 +39,7 @@
- 0
- sage: subprocess.call("echo syntax error | ipython", **kwds) in (0,1)
- True
-- sage: subprocess.call("echo syntax error | singular", **kwds)
-+ sage: subprocess.call("echo syntax error | Singular", **kwds)
- 0
- """
- from __future__ import print_function
+ ....: "#clang C++",
+- ....: "#cinclude %s/include/singular %s/include/factory"%(SAGE_LOCAL, SAGE_LOCAL),
+- ....: "#clib m readline Singular givaro ntl gmpxx gmp",
++ ....: "#cinclude /usr/include/singular /usr/include/singular/singular /usr/include/{0}/singular /usr/include/{0}/singular/singular".format(sysconfig.get_config_var('MULTIARCH')),
++ ....: "#clib m readline singular-Singular givaro ntl gmpxx gmp",
+ ....: "from sage.rings.polynomial.multi_polynomial_libsingular cimport MPolynomial_libsingular",
+ ....: "from sage.libs.singular.polynomial cimport singular_polynomial_pow",
+ ....: "def test(MPolynomial_libsingular p):",
diff --git a/debian/patches/series b/debian/patches/series
index 14fd008..e0247be 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -33,7 +33,6 @@ debian-nauty.patch
debian-gsl-cblas.patch
debian-arb.patch
debian-cython-sys-path.patch
-debian-octave.patch
debian-sage-gap-reset.patch
# this next one contains some stuff that should be forwarded upstream
debian-fix-trivial-test-cases.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/sagemath.git
More information about the debian-science-commits
mailing list