[sagemath] 02/02: Update changelog and refresh patches for sage 8.0.beta10.
Tobias Hansen
thansen at moszumanska.debian.org
Wed Jun 14 23:03:08 UTC 2017
This is an automated email from the git hooks/post-receive script.
thansen pushed a commit to branch master
in repository sagemath.
commit b13cbb2a3242405564344c095adeb93dfd3ec9b7
Author: Tobias Hansen <thansen at debian.org>
Date: Wed Jun 14 23:02:49 2017 +0000
Update changelog and refresh patches for sage 8.0.beta10.
---
debian/changelog | 2 +-
debian/patches/d0-cython-sys-path.patch | 2 +-
debian/patches/d0-gsl-cblas.patch | 12 ++----------
debian/patches/d0-nauty.patch | 2 +-
debian/patches/d0-pari-stackwarn.patch | 4 ++--
debian/patches/d0-paths.patch | 2 +-
debian/patches/d0-singular.patch | 2 +-
debian/patches/d1-doc-docs.patch | 2 +-
debian/patches/d1-install-paths.patch | 4 ++--
debian/patches/d1-multiarch-python-paths.patch | 4 ++--
debian/patches/d1-sage-env.patch | 20 ++++++++++----------
...ert-minor-feature-dependent-on-python-patch.patch | 2 +-
debian/patches/dt-work-around-doc-common-conf.patch | 2 +-
debian/patches/u1-scripts-dir.patch | 2 +-
debian/patches/u2-allow-override-sage-local.patch | 4 ++--
debian/patches/u2-fix-less-trivial-test-cases.patch | 2 +-
debian/patches/u2-fix-trivial-test-cases.patch | 6 +++---
17 files changed, 33 insertions(+), 41 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index b0c69f7..4543438 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-sagemath (8.0~beta9-1) UNRELEASED; urgency=medium
+sagemath (8.0~beta10-1) UNRELEASED; urgency=medium
* New upstream version.
* New (Build-)Depends:
diff --git a/debian/patches/d0-cython-sys-path.patch b/debian/patches/d0-cython-sys-path.patch
index e726bdb..3593ef3 100644
--- a/debian/patches/d0-cython-sys-path.patch
+++ b/debian/patches/d0-cython-sys-path.patch
@@ -15,7 +15,7 @@ Origin: https://git.archlinux.org/svntogit/community.git/tree/trunk?h=packages/s
create_extension=sage_create_extension,
--- a/sage/src/sage/misc/cython.py
+++ b/sage/src/sage/misc/cython.py
-@@ -281,6 +281,7 @@
+@@ -277,6 +277,7 @@
# Add cysignals directory to includes
for path in sys.path:
diff --git a/debian/patches/d0-gsl-cblas.patch b/debian/patches/d0-gsl-cblas.patch
index 13604fa..a8383da 100644
--- a/debian/patches/d0-gsl-cblas.patch
+++ b/debian/patches/d0-gsl-cblas.patch
@@ -28,7 +28,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
-@@ -30,17 +30,16 @@
+@@ -30,10 +30,9 @@
# CBLAS can be one of multiple implementations
@@ -40,13 +40,5 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+cblas_library_dirs = []
+cblas_include_dirs = []
- # TODO: Remove Cygwin hack by installing a suitable cblas.pc
- if os.path.exists('/usr/lib/libblas.dll.a'):
- cblas_libs = 'gslcblas'
-
standard_libs = [
-- 'mpfr', 'gmp', 'gmpxx', 'stdc++', 'pari', 'm',
-+ 'mpfr', 'gmp', 'gmpxx', 'stdc++', 'pari', 'm',
- 'ec', 'gsl',
- ] + cblas_libs + [
- 'ntl']
+ 'mpfr', 'gmp', 'gmpxx', 'stdc++', 'pari', 'm',
diff --git a/debian/patches/d0-nauty.patch b/debian/patches/d0-nauty.patch
index 469e153..6ede97d 100644
--- a/debian/patches/d0-nauty.patch
+++ b/debian/patches/d0-nauty.patch
@@ -1,6 +1,6 @@
--- a/sage/src/sage/graphs/graph_generators.py
+++ b/sage/src/sage/graphs/graph_generators.py
-@@ -878,10 +878,10 @@
+@@ -879,10 +879,10 @@
sage: gen = graphs.nauty_geng("4", debug=True)
sage: print(next(gen))
diff --git a/debian/patches/d0-pari-stackwarn.patch b/debian/patches/d0-pari-stackwarn.patch
index 78e9afb..9924413 100644
--- a/debian/patches/d0-pari-stackwarn.patch
+++ b/debian/patches/d0-pari-stackwarn.patch
@@ -83,7 +83,7 @@ Author: Tobias Hansen <thansen at debian.org>
Graphics object consisting of 1 graphics primitive
--- a/sage/src/sage/rings/integer.pyx
+++ b/sage/src/sage/rings/integer.pyx
-@@ -6536,6 +6536,7 @@
+@@ -6537,6 +6537,7 @@
....: (2^100).binomial(2^22, algorithm='pari')
....: except AlarmInterrupt:
....: pass
@@ -224,7 +224,7 @@ Author: Tobias Hansen <thansen at debian.org>
--- a/sage/src/sage/functions/orthogonal_polys.py
+++ b/sage/src/sage/functions/orthogonal_polys.py
-@@ -1227,6 +1227,7 @@
+@@ -1231,6 +1231,7 @@
sage: legendre_P(4,x)
35/8*x^4 - 15/4*x^2 + 3/8
sage: legendre_P(10000,x).coefficient(x,1)
diff --git a/debian/patches/d0-paths.patch b/debian/patches/d0-paths.patch
index d60087f..cd11c7d 100644
--- a/debian/patches/d0-paths.patch
+++ b/debian/patches/d0-paths.patch
@@ -17,7 +17,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/sage/src/sage/misc/cython.py
+++ b/sage/src/sage/misc/cython.py
-@@ -488,7 +488,7 @@
+@@ -484,7 +484,7 @@
file_list = []
for fname in additional_source_files:
fname = fname.replace("$SAGE_SRC", SAGE_SRC)
diff --git a/debian/patches/d0-singular.patch b/debian/patches/d0-singular.patch
index ced09f1..a240b49 100644
--- a/debian/patches/d0-singular.patch
+++ b/debian/patches/d0-singular.patch
@@ -27,7 +27,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
new_lookup = re.compile("\* ([^:]*):*([^.]*)\..*")
--- a/sage/src/sage/misc/cython.py
+++ b/sage/src/sage/misc/cython.py
-@@ -278,6 +278,11 @@
+@@ -274,6 +274,11 @@
args = ['-w','-O2'] + args
libdirs = cblas_library_dirs
diff --git a/debian/patches/d1-doc-docs.patch b/debian/patches/d1-doc-docs.patch
index b7e4b49..7fe3de3 100644
--- a/debian/patches/d1-doc-docs.patch
+++ b/debian/patches/d1-doc-docs.patch
@@ -1,6 +1,6 @@
--- a/sage/src/sage/misc/sagedoc.py
+++ b/sage/src/sage/misc/sagedoc.py
-@@ -1499,8 +1499,8 @@
+@@ -1501,8 +1501,8 @@
url = self._base_url + os.path.join(name, "index.html")
path = os.path.join(self._base_path, name, "index.html")
if not os.path.exists(path):
diff --git a/debian/patches/d1-install-paths.patch b/debian/patches/d1-install-paths.patch
index ebd90b7..866c85f 100644
--- a/debian/patches/d1-install-paths.patch
+++ b/debian/patches/d1-install-paths.patch
@@ -48,7 +48,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
# containing this shell script. If unset, we will try to figure it out
--- a/sage/src/sage/env.py
+++ b/sage/src/sage/env.py
-@@ -103,9 +103,9 @@
+@@ -104,9 +104,9 @@
except AttributeError: # in case of use inside virtualenv
sitepackages_dirs = [os.path.join(os.path.dirname(site.__file__),
'site-packages')]
@@ -60,7 +60,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
_add_variable_or_fallback('SAGE_CYTHONIZED', opj('$SAGE_ROOT', 'src', 'build', 'cythonized'))
-@@ -213,8 +213,8 @@
+@@ -222,8 +222,8 @@
['.../include',
'.../include/python...',
'.../python.../numpy/core/include',
diff --git a/debian/patches/d1-multiarch-python-paths.patch b/debian/patches/d1-multiarch-python-paths.patch
index 06e991a..9c14673 100644
--- a/debian/patches/d1-multiarch-python-paths.patch
+++ b/debian/patches/d1-multiarch-python-paths.patch
@@ -7,7 +7,7 @@ Forwarded: not-needed
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/sage/src/sage/misc/sageinspect.py
+++ b/sage/src/sage/misc/sageinspect.py
-@@ -123,6 +123,7 @@
+@@ -124,6 +124,7 @@
import tokenize
import types
import re
@@ -15,7 +15,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
EMBEDDED_MODE = False
from sage.env import SAGE_SRC
-@@ -1243,7 +1244,12 @@
+@@ -1244,7 +1245,12 @@
except TypeError: # this happens for Python builtins
return ''
if sourcefile.endswith(loadable_module_extension()):
diff --git a/debian/patches/d1-sage-env.patch b/debian/patches/d1-sage-env.patch
index fbb12c0..89a4b58 100644
--- a/debian/patches/d1-sage-env.patch
+++ b/debian/patches/d1-sage-env.patch
@@ -171,7 +171,7 @@ Author: Tobias Hansen <thansen at debian.org>, Ximin Luo <infinity0 at debian.org>
run ``make doc-clean``, because the presence, or lack, of pictures
--- a/sage/src/sage/structure/sage_object.pyx
+++ b/sage/src/sage/structure/sage_object.pyx
-@@ -1548,7 +1548,7 @@
+@@ -1593,7 +1593,7 @@
When run with no arguments :meth:`unpickle_all` tests that all of the
"standard" pickles stored in the pickle_jar at
@@ -193,7 +193,7 @@ Author: Tobias Hansen <thansen at debian.org>, Ximin Luo <infinity0 at debian.org>
# Walk through all of the files in the sage_directory
--- a/sage/src/sage/env.py
+++ b/sage/src/sage/env.py
-@@ -20,6 +20,7 @@
+@@ -21,6 +21,7 @@
import os
import socket
import site
@@ -201,7 +201,7 @@ Author: Tobias Hansen <thansen at debian.org>, Ximin Luo <infinity0 at debian.org>
from . import version
opj = os.path.join
-@@ -134,12 +135,12 @@
+@@ -135,12 +136,12 @@
_add_variable_or_fallback('SAGE_IMPORTALL', 'yes')
# additional packages locations
@@ -220,12 +220,12 @@ Author: Tobias Hansen <thansen at debian.org>, Ximin Luo <infinity0 at debian.org>
# locate singular shared object
if UNAME[:6] == "CYGWIN":
-@@ -149,7 +150,7 @@
- else:
- extension = "so"
- # library name changed from libsingular to libSingular btw 3.x and 4.x
--SINGULAR_SO = SAGE_LOCAL+"/lib/libSingular."+extension
-+SINGULAR_SO = "/usr/lib/%s/libsingular-Singular.so" % sysconfig.get_config_var('MULTIARCH')
+@@ -152,7 +153,7 @@
+ else:
+ extension = "so"
+ # library name changed from libsingular to libSingular btw 3.x and 4.x
+- SINGULAR_SO = SAGE_LOCAL+"/lib/libSingular."+extension
++ SINGULAR_SO = "/usr/lib/%s/libsingular-Singular.so" % sysconfig.get_config_var('MULTIARCH')
+
_add_variable_or_fallback('SINGULAR_SO', SINGULAR_SO)
- # post process
diff --git a/debian/patches/df-revert-minor-feature-dependent-on-python-patch.patch b/debian/patches/df-revert-minor-feature-dependent-on-python-patch.patch
index e8f9bde..e9e0124 100644
--- a/debian/patches/df-revert-minor-feature-dependent-on-python-patch.patch
+++ b/debian/patches/df-revert-minor-feature-dependent-on-python-patch.patch
@@ -9,7 +9,7 @@ Forwarded: not-needed
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/sage/src/sage/rings/integer.pyx
+++ b/sage/src/sage/rings/integer.pyx
-@@ -761,16 +761,6 @@
+@@ -762,16 +762,6 @@
4
sage: v[Integer(2):Integer(4)]
[3, 4]
diff --git a/debian/patches/dt-work-around-doc-common-conf.patch b/debian/patches/dt-work-around-doc-common-conf.patch
index 3c2370f..ff864d9 100644
--- a/debian/patches/dt-work-around-doc-common-conf.patch
+++ b/debian/patches/dt-work-around-doc-common-conf.patch
@@ -8,7 +8,7 @@ Bug: https://trac.sagemath.org/ticket/21732
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/sage/src/sage/misc/sagedoc.py
+++ b/sage/src/sage/misc/sagedoc.py
-@@ -491,10 +491,15 @@
+@@ -493,10 +493,15 @@
"""
if embedded:
return s
diff --git a/debian/patches/u1-scripts-dir.patch b/debian/patches/u1-scripts-dir.patch
index e7abd98..6a953ec 100644
--- a/debian/patches/u1-scripts-dir.patch
+++ b/debian/patches/u1-scripts-dir.patch
@@ -5,7 +5,7 @@ Forwarded: TODO
--- a/sage/src/sage/env.py
+++ b/sage/src/sage/env.py
-@@ -92,6 +92,7 @@
+@@ -93,6 +93,7 @@
_add_variable_or_fallback('SAGE_ROOT', None)
_add_variable_or_fallback('SAGE_LOCAL', None)
_add_variable_or_fallback('SAGE_ETC', opj('$SAGE_LOCAL', 'etc'))
diff --git a/debian/patches/u2-allow-override-sage-local.patch b/debian/patches/u2-allow-override-sage-local.patch
index c89cfa3..e17f27d 100644
--- a/debian/patches/u2-allow-override-sage-local.patch
+++ b/debian/patches/u2-allow-override-sage-local.patch
@@ -30,7 +30,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
export SAGE_DOC_SRC="$SAGE_SRC/doc"
--- a/sage/src/sage/env.py
+++ b/sage/src/sage/env.py
-@@ -77,7 +77,7 @@
+@@ -78,7 +78,7 @@
if force:
value = fallback
if isinstance(value, six.string_types):
@@ -39,7 +39,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
if isinstance(v, six.string_types):
value = value.replace('$'+k, v)
SAGE_ENV[key] = value
-@@ -115,7 +115,7 @@
+@@ -116,7 +116,7 @@
_add_variable_or_fallback('SAGE_EXTCODE', opj('$SAGE_SHARE', 'sage', 'ext'))
_add_variable_or_fallback('SAGE_LOGS', opj('$SAGE_ROOT', 'logs', 'pkgs'))
diff --git a/debian/patches/u2-fix-less-trivial-test-cases.patch b/debian/patches/u2-fix-less-trivial-test-cases.patch
index 2b2b358..7445b01 100644
--- a/debian/patches/u2-fix-less-trivial-test-cases.patch
+++ b/debian/patches/u2-fix-less-trivial-test-cases.patch
@@ -35,7 +35,7 @@ to reduce the noise in our test results.
numerical integration::
--- a/sage/src/sage/rings/integer.pyx
+++ b/sage/src/sage/rings/integer.pyx
-@@ -6088,8 +6088,7 @@
+@@ -6089,8 +6089,7 @@
sage: 1 << (2^60)
Traceback (most recent call last):
...
diff --git a/debian/patches/u2-fix-trivial-test-cases.patch b/debian/patches/u2-fix-trivial-test-cases.patch
index dd39524..c8ce0c3 100644
--- a/debian/patches/u2-fix-trivial-test-cases.patch
+++ b/debian/patches/u2-fix-trivial-test-cases.patch
@@ -70,7 +70,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
sage: rc is None
--- a/sage/src/sage/misc/cython.py
+++ b/sage/src/sage/misc/cython.py
-@@ -211,14 +211,15 @@
+@@ -207,14 +207,15 @@
'm',
'ec',
'gsl',
@@ -89,7 +89,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
'c',
[], ['-w', '-O2'],...)
sage: s, libs, inc, lang, f, args, libdirs = pyx_preparse("# clang c++\n #clib foo\n # cinclude bar\n")
-@@ -233,7 +234,7 @@
+@@ -229,7 +230,7 @@
'm',
'ec',
'gsl',
@@ -98,7 +98,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
'ntl']
sage: libs[1:] == sage.misc.cython.standard_libs
True
-@@ -243,9 +244,10 @@
+@@ -239,9 +240,10 @@
'.../include',
'.../include/python...',
'.../python.../numpy/core/include',
--
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