[sagemath] 04/06: Refresh remaining patches.
Tobias Hansen
thansen at moszumanska.debian.org
Tue Aug 9 13:39:35 UTC 2016
This is an automated email from the git hooks/post-receive script.
thansen pushed a commit to branch master
in repository sagemath.
commit c07d216412b4c762f3a47d7e1c59aef5868aae3b
Author: Tobias Hansen <thansen at debian.org>
Date: Tue Aug 9 13:19:51 2016 +0000
Refresh remaining patches.
---
debian/patches/debian-arb.patch | 8 +++---
debian/patches/debian-cython-sys-path.patch | 2 +-
debian/patches/debian-gsl-cblas.patch | 2 +-
debian/patches/debian-libgap-sage.patch | 12 ++++-----
debian/patches/debian-maxima.patch | 14 +++++------
debian/patches/debian-nauty.patch | 6 ++---
debian/patches/debian-pari.patch | 11 +--------
debian/patches/debian-paths.patch | 33 ++++++++++---------------
debian/patches/debian-rubiks.patch | 6 ++---
debian/patches/debian-sage-env.patch | 8 +++---
debian/patches/debian-singular.patch | 12 ++++-----
debian/patches/debian-temp-userdir.patch | 8 +++---
debian/patches/temp-cython-include-source.patch | 2 +-
13 files changed, 54 insertions(+), 70 deletions(-)
diff --git a/debian/patches/debian-arb.patch b/debian/patches/debian-arb.patch
index 280ccad..11e77a7 100644
--- a/debian/patches/debian-arb.patch
+++ b/debian/patches/debian-arb.patch
@@ -6,16 +6,16 @@ Forwarded: not-needed
--- a/sage/src/module_list.py
+++ b/sage/src/module_list.py
-@@ -131,7 +131,7 @@
+@@ -137,7 +137,7 @@
"singular", "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",
- "polybori",
- "polybori_groebner",
+ "brial",
+ "brial_groebner",
"m4rie",
-@@ -888,7 +888,7 @@
+@@ -909,7 +909,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 6daf4ef..a9b3a66 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
-@@ -591,6 +591,7 @@
+@@ -590,6 +590,7 @@
build_dir=SAGE_CYTHONIZED,
force=force,
aliases=aliases,
diff --git a/debian/patches/debian-gsl-cblas.patch b/debian/patches/debian-gsl-cblas.patch
index 89f849a..0e1eb0d 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
-@@ -26,17 +26,16 @@
+@@ -27,17 +27,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 2acf720..09128f0 100644
--- a/debian/patches/debian-libgap-sage.patch
+++ b/debian/patches/debian-libgap-sage.patch
@@ -19,7 +19,7 @@ Forwarded: not-needed
# VALGRIND=valgrind --leak-check=full
# VALGRIND=valgrind --db-attach=yes
@@ -12,11 +14,11 @@
- LD_LIBRARY_PATH=$(SAGE_LOCAL)/lib $(VALGRIND) ./main
+ $(VALGRIND) ./main
main: main.o Makefile
- gcc -L$(SAGE_LOCAL)/lib -o main main.o -lgap -lcsage -lntl -lstdc++ -lpari -lpython2.7 -lm -lgmp
@@ -45,8 +45,8 @@ Forwarded: not-needed
# GD image library
gd_pc = pkgconfig.parse('gdlib')
gd_libs = list(gd_pc['libraries'])
-@@ -133,8 +137,8 @@
- "polybori_groebner",
+@@ -139,8 +143,8 @@
+ "brial_groebner",
"m4rie",
] + m4ri_libs + [
- "zn_poly", "gap",
@@ -56,7 +56,7 @@ Forwarded: not-needed
"m", "readline", "Lfunction" ,
] + cblas_libs + [
"cryptominisat",
-@@ -732,15 +736,15 @@
+@@ -753,15 +757,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
-@@ -161,6 +161,12 @@
+@@ -160,6 +160,12 @@
"ntl": [ os.path.join('/usr/include', '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):
-@@ -178,8 +184,8 @@
+@@ -177,8 +183,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 a539282..ea831c4 100644
--- a/debian/patches/debian-maxima.patch
+++ b/debian/patches/debian-maxima.patch
@@ -11,7 +11,7 @@
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
-@@ -77,7 +77,7 @@
+@@ -98,7 +98,7 @@
## We begin here by initializing Maxima in library mode
## i.e. loading it into ECL
ecl_eval("(setf *load-verbose* NIL)")
@@ -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
-@@ -555,7 +555,7 @@
+@@ -556,7 +556,7 @@
Expect.__init__(self,
name = 'maxima',
prompt = '\(\%i[0-9]+\) ',
@@ -31,7 +31,7 @@
script_subdirectory = script_subdirectory,
restart_on_ctrlc = False,
verbose_start = False,
-@@ -788,7 +788,7 @@
+@@ -789,7 +789,7 @@
if not wait_for_prompt:
return
# line_echo sometimes has randomly inserted terminal echo in front #15811
@@ -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
-@@ -164,7 +164,7 @@
+@@ -165,7 +165,7 @@
-- Function: gcd (<p_1>, <p_2>, <x_1>, ...)
...
"""
@@ -51,7 +51,7 @@
if sage.server.support.EMBEDDED_MODE:
cmd += '< /dev/null'
-@@ -172,10 +172,7 @@
+@@ -173,10 +173,7 @@
p = subprocess.Popen(cmd, shell=True, stdin=subprocess.PIPE,
stdout=subprocess.PIPE, stderr=subprocess.PIPE)
res = p.stdout.read()
@@ -63,7 +63,7 @@
return AsciiArtString(res)
else:
subprocess.Popen(cmd, shell=True)
-@@ -2356,7 +2353,7 @@
+@@ -2357,7 +2354,7 @@
sage: maxima_version()
'5.35.1'
"""
@@ -72,7 +72,7 @@
def maxima_console():
"""
-@@ -2372,4 +2369,4 @@
+@@ -2373,4 +2370,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.')
diff --git a/debian/patches/debian-nauty.patch b/debian/patches/debian-nauty.patch
index 95017ab..53d6307 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
-@@ -484,7 +484,7 @@
+@@ -483,7 +483,7 @@
nauty_input += " "+str(n) +" "
@@ -11,7 +11,7 @@
--- a/sage/src/sage/graphs/graph_generators.py
+++ b/sage/src/sage/graphs/graph_generators.py
-@@ -869,7 +869,7 @@
+@@ -872,7 +872,7 @@
>A geng -d0D3 n=4 e=0-6
"""
import subprocess
@@ -22,7 +22,7 @@
if debug:
--- a/sage/src/sage/graphs/hypergraph_generators.py
+++ b/sage/src/sage/graphs/hypergraph_generators.py
-@@ -136,7 +136,7 @@
+@@ -137,7 +137,7 @@
nauty_input += " "+str(number_of_vertices) +" "+str(number_of_sets)+" "
diff --git a/debian/patches/debian-pari.patch b/debian/patches/debian-pari.patch
index 7e3fcea..9d1ba3f 100644
--- a/debian/patches/debian-pari.patch
+++ b/debian/patches/debian-pari.patch
@@ -1,6 +1,6 @@
--- a/sage/src/sage/interfaces/gp.py
+++ b/sage/src/sage/interfaces/gp.py
-@@ -245,9 +245,9 @@
+@@ -246,9 +246,9 @@
# list of directories where gp will look for scripts (only current working directory)
self._eval_line('default(path,".");')
# location of elldata, seadata, galdata
@@ -12,15 +12,6 @@
# logfile disabled since Expect already logs
self._eval_line('default(log,0);')
# set random seed
-@@ -526,7 +526,7 @@
- sage: gp.get_default('log')
- 0
- sage: gp.get_default('datadir')
-- '.../local/share/pari'
-+ '.../share/pari'
- sage: gp.get_default('seriesprecision')
- 16
- sage: gp.get_default('realprecision')
--- a/sage/src/Makefile
+++ b/sage/src/Makefile
@@ -14,7 +14,7 @@
diff --git a/debian/patches/debian-paths.patch b/debian/patches/debian-paths.patch
index 218fa3c..994cce1 100644
--- a/debian/patches/debian-paths.patch
+++ b/debian/patches/debian-paths.patch
@@ -25,8 +25,8 @@
+ # exit 1
+ # fi
- # Display the startup banner
- if [ "$SAGE_BANNER" = "bare" ]; then
+ # Display the startup banner (unless SAGE_BANNER is explictly "no")
+ if [ "$SAGE_BANNER" != "no" ]; then
--- a/sage/src/module_list.py
+++ b/sage/src/module_list.py
@@ -3,7 +3,7 @@
@@ -38,16 +38,9 @@
#########################################################
### pkg-config setup
---- a/sage/src/sage/dev/all.py
-+++ b/sage/src/sage/dev/all.py
-@@ -1,3 +1,3 @@
- from sage.misc.lazy_import import lazy_import
-
--lazy_import('sage.dev.sagedev_instance', 'dev')
-+#lazy_import('sage.dev.sagedev_instance', 'dev')
--- a/sage/src/sage/doctest/control.py
+++ b/sage/src/sage/doctest/control.py
-@@ -171,6 +171,8 @@
+@@ -174,6 +174,8 @@
True
"""
base, ext = os.path.splitext(filename)
@@ -58,7 +51,7 @@
with open(filename) as F:
--- a/sage/src/sage/env.py
+++ b/sage/src/sage/env.py
-@@ -90,8 +90,8 @@
+@@ -92,8 +92,8 @@
_add_variable_or_fallback('SAGE_ROOT', None)
_add_variable_or_fallback('SAGE_LOCAL', opj('$SAGE_ROOT', 'local'))
_add_variable_or_fallback('SAGE_ETC', opj('$SAGE_LOCAL', 'etc'))
@@ -68,7 +61,7 @@
+_add_variable_or_fallback('SAGE_SHARE', opj('/usr/share/sagemath'))
_add_variable_or_fallback('SAGE_SRC', opj('$SAGE_ROOT', 'src'))
- _add_variable_or_fallback('SITE_PACKAGES', site.getsitepackages())
+
--- a/sage/src/sage/ext/pselect.pyx
+++ b/sage/src/sage/ext/pselect.pyx
@@ -290,7 +290,7 @@
@@ -82,7 +75,7 @@
sage: len(r), len(w), len(x), t
--- a/sage/src/sage/interfaces/gap.py
+++ b/sage/src/sage/interfaces/gap.py
-@@ -193,7 +193,7 @@
+@@ -194,7 +194,7 @@
WORKSPACE = os.path.join(GAP_DIR, 'workspace-%s'%abs(hash(SAGE_LOCAL)))
@@ -93,7 +86,7 @@
--- a/sage/src/sage/libs/gap/util.pyx
+++ b/sage/src/sage/libs/gap/util.pyx
-@@ -156,7 +156,7 @@
+@@ -157,7 +157,7 @@
'/home/vbraun/opt/sage-5.3.rc0/local/gap/latest'
"""
import os.path
@@ -101,10 +94,10 @@
+ gapdir = '/usr/share/gap'
if os.path.exists(gapdir):
return gapdir
- print 'The gap-4.5.5.spkg (or later) seems to be not installed!'
+ 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
-@@ -409,7 +409,7 @@
+@@ -410,7 +410,7 @@
file_list = []
for fname in additional_source_files:
fname = fname.replace("$SAGE_SRC", SAGE_SRC)
@@ -115,7 +108,7 @@
else:
--- a/sage/src/sage/tests/cmdline.py
+++ b/sage/src/sage/tests/cmdline.py
-@@ -551,12 +551,6 @@
+@@ -561,12 +561,6 @@
sage: ret
0
@@ -130,7 +123,7 @@
--- a/sage/src/sage/tests/gap_packages.py
+++ b/sage/src/sage/tests/gap_packages.py
-@@ -103,7 +103,7 @@
+@@ -102,7 +102,7 @@
sage: from sage.tests.gap_packages import all_installed_packages
sage: all_installed_packages()
@@ -141,7 +134,7 @@
for path in libgap.eval('GAP_ROOT_PATHS').sage():
--- a/sage/src/setup.py
+++ b/sage/src/setup.py
-@@ -156,9 +156,9 @@
+@@ -155,9 +155,9 @@
# (that are likely to change on an upgrade) here:
# [At least at the moment. Make sure the headers aren't copied with "-p",
# or explicitly touch them in the respective spkg's spkg-install.]
@@ -154,7 +147,7 @@
}
# In the loop below, don't append to any list, since many of these
-@@ -178,7 +178,7 @@
+@@ -177,7 +177,7 @@
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-rubiks.patch b/debian/patches/debian-rubiks.patch
index d5578f1..b194868 100644
--- a/debian/patches/debian-rubiks.patch
+++ b/debian/patches/debian-rubiks.patch
@@ -1,6 +1,6 @@
--- a/sage/src/sage/interfaces/rubik.py
+++ b/sage/src/sage/interfaces/rubik.py
-@@ -88,7 +88,7 @@
+@@ -90,7 +90,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
-@@ -176,7 +176,7 @@
+@@ -178,7 +178,7 @@
class CubexSolver:
@@ -18,7 +18,7 @@
def __call__(self, facets):
return self.solve(facets)
-@@ -230,7 +230,7 @@
+@@ -232,7 +232,7 @@
class DikSolver:
diff --git a/debian/patches/debian-sage-env.patch b/debian/patches/debian-sage-env.patch
index 37b6a02..bfd0828 100644
--- a/debian/patches/debian-sage-env.patch
+++ b/debian/patches/debian-sage-env.patch
@@ -11,7 +11,7 @@
export SAGE_SPKG_INST="$SAGE_LOCAL/var/lib/sage/installed"
export SAGE_LOGS="$SAGE_ROOT/logs/pkgs"
export SAGE_SRC="$SAGE_ROOT/src"
-@@ -309,12 +309,12 @@
+@@ -315,12 +315,12 @@
fi
# For PARI/GP
@@ -29,15 +29,15 @@
if [ -z "$SAGE_REPO_ANONYMOUS" ]; then
SAGE_REPO_ANONYMOUS="git://trac.sagemath.org/sage.git"
-@@ -439,7 +439,6 @@
+@@ -445,7 +445,6 @@
fi
fi
fi
-MAXIMA_PREFIX="$SAGE_ROOT/local" && export MAXIMA_PREFIX
- ############ architecture flags
+ PERL5LIB="$SAGE_LOCAL/lib/perl5:$PERL5LIB" && export PERL5LIB
-@@ -606,9 +605,6 @@
+@@ -614,9 +613,6 @@
LD_LIBRARY_PATH="$SAGE_LOCAL/bin:$LD_LIBRARY_PATH" && export LD_LIBRARY_PATH
fi
diff --git a/debian/patches/debian-singular.patch b/debian/patches/debian-singular.patch
index ee6694f..546740e 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
-@@ -468,7 +468,7 @@
+@@ -467,7 +467,7 @@
if [ "$1" = '-singular' -o "$1" = '--singular' ]; then
shift
@@ -11,7 +11,7 @@
if [ "$1" = '-sqlite3' -o "$1" = '--sqlite3' ]; then
--- a/sage/src/sage/interfaces/singular.py
+++ b/sage/src/sage/interfaces/singular.py
-@@ -2248,7 +2248,7 @@
+@@ -2249,7 +2249,7 @@
nodes.clear()
node_names.clear()
@@ -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 @@
+@@ -712,15 +712,13 @@
cdef void *handle = NULL
@@ -33,7 +33,7 @@
- if not handle:
- err = dlerror()
- if err:
-- print err
+- print(err)
- break
+ lib = "/usr/lib/libsingular.so"
+ if os.path.exists(lib):
@@ -44,10 +44,10 @@
+ print err
if handle == NULL:
- raise ImportError, "cannot load libSINGULAR library"
+ raise ImportError("cannot load libSINGULAR library")
--- a/sage/src/sage/misc/cython.py
+++ b/sage/src/sage/misc/cython.py
-@@ -305,7 +305,7 @@
+@@ -306,7 +306,7 @@
sage: code = [
... "#clang C++",
diff --git a/debian/patches/debian-temp-userdir.patch b/debian/patches/debian-temp-userdir.patch
index 05fba6f..34c96e9 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
-@@ -596,6 +597,11 @@
+@@ -595,6 +596,11 @@
'embedsignature': True,
'profile': profile,
})
@@ -83,15 +83,15 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
open(version_file, 'w').write(version_stamp)
-@@ -616,7 +622,7 @@
+@@ -615,7 +621,7 @@
python_packages, python_modules = find_python_sources(
SAGE_SRC, ['sage', 'sage_setup'])
python_data_files = find_extra_files(python_packages,
- ".", SAGE_CYTHONIZED, SAGE_LIB, ["ntlwrap.cpp"])
+ ".", SAGE_CYTHONIZED, SAGE_USER_LIB, ["ntlwrap.cpp"])
- print("Discovered Python/Cython sources, time: %.2f seconds." % (time.time() - t))
-
+ print('python_packages = {0}'.format(python_packages))
+ print('python_modules = {0}'.format(python_modules))
--- a/sage/src/sage/repl/ipython_kernel/install.py
+++ b/sage/src/sage/repl/ipython_kernel/install.py
@@ -14,7 +14,7 @@
diff --git a/debian/patches/temp-cython-include-source.patch b/debian/patches/temp-cython-include-source.patch
index 66debba..95b91a0 100644
--- a/debian/patches/temp-cython-include-source.patch
+++ b/debian/patches/temp-cython-include-source.patch
@@ -4,7 +4,7 @@ Author: Tobias Hansen <thansen at debian.org>
--- a/sage/src/sage/misc/cython.py
+++ b/sage/src/sage/misc/cython.py
-@@ -229,7 +229,7 @@
+@@ -230,7 +230,7 @@
additional_source_files, s = parse_keywords('cfile', s)
v, s = parse_keywords('cinclude', s)
--
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