[sagemath] 03/05: Refresh patches.
Tobias Hansen
thansen at moszumanska.debian.org
Wed Oct 18 19:24: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 bf6b5f6af193675abd8acdf15fed151079744825
Author: Tobias Hansen <thansen at debian.org>
Date: Wed Oct 18 19:24:03 2017 +0100
Refresh patches.
---
debian/patches/d0-gsl-cblas.patch | 2 +-
debian/patches/d0-paths.patch | 10 +--
debian/patches/d0-singular.patch | 2 +-
debian/patches/u0-version-pynac-0.7.12.patch | 77 +++++++++++++++-------
.../u1-version-pbori-boost1.62-hashes.patch | 6 +-
5 files changed, 64 insertions(+), 33 deletions(-)
diff --git a/debian/patches/d0-gsl-cblas.patch b/debian/patches/d0-gsl-cblas.patch
index a8383da..a099870 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,10 +30,9 @@
+@@ -31,10 +31,9 @@
# CBLAS can be one of multiple implementations
diff --git a/debian/patches/d0-paths.patch b/debian/patches/d0-paths.patch
index 7fed0c7..1caf559 100644
--- a/debian/patches/d0-paths.patch
+++ b/debian/patches/d0-paths.patch
@@ -17,15 +17,15 @@ 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
-@@ -483,7 +483,7 @@
- file_list = []
+@@ -468,7 +468,7 @@
+ extra_sources = []
for fname in additional_source_files:
fname = fname.replace("$SAGE_SRC", SAGE_SRC)
- fname = fname.replace("$SAGE_LOCAL", SAGE_LOCAL)
+ fname = fname.replace("$SAGE_LOCAL", '/usr/include')
- if fname.startswith(os.path.sep):
- file_list.append("'"+fname+"'")
- else:
+ extra_sources.append(fname)
+
+ # Now do the actual build, directly calling Cython and distutils
--- a/sage/src/sage/libs/lcalc/lcalc_sage.h
+++ b/sage/src/sage/libs/lcalc/lcalc_sage.h
@@ -1,4 +1,4 @@
diff --git a/debian/patches/d0-singular.patch b/debian/patches/d0-singular.patch
index 8ffe5a0..83f9ef6 100644
--- a/debian/patches/d0-singular.patch
+++ b/debian/patches/d0-singular.patch
@@ -29,7 +29,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
-@@ -274,6 +274,11 @@
+@@ -271,6 +271,11 @@
args = ['-w','-O2'] + args
libdirs = cblas_library_dirs
diff --git a/debian/patches/u0-version-pynac-0.7.12.patch b/debian/patches/u0-version-pynac-0.7.12.patch
index 75a02eb..9fd9055 100644
--- a/debian/patches/u0-version-pynac-0.7.12.patch
+++ b/debian/patches/u0-version-pynac-0.7.12.patch
@@ -6,9 +6,40 @@ Date: Sun, 1 Oct 2017 15:42:27 +0200
Subject: 23950: update interface
---
+
src/sage/libs/pynac/pynac.pxd | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
+From d8e30d63ddc068a82273235ac85ff85cde016d2f Mon Sep 17 00:00:00 2001
+From: Ralf Stephan <ralf at ark.in-berlin.de>
+Date: Sun, 1 Oct 2017 15:46:21 +0200
+Subject: 23950: changes to symbolics code because of interface changes
+
+---
+ src/sage/symbolic/expression.pyx | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+From 41b0e2f445a13582cba37868f8fc80d6be1734a0 Mon Sep 17 00:00:00 2001
+From: Ralf Stephan <ralf at ark.in-berlin.de>
+Date: Sun, 1 Oct 2017 16:03:22 +0200
+Subject: 23950: doctest fixes
+
+---
+ .../de/thematische_anleitungen/sage_gymnasium.rst | 2 +-
+ src/sage/coding/code_bounds.py | 4 +--
+ src/sage/functions/log.py | 8 +++---
+ src/sage/functions/orthogonal_polys.py | 2 +-
+ src/sage/rings/asymptotic/asymptotic_ring.py | 2 +-
+ ...symptotics_multivariate_generating_functions.py | 30 ++++++++++++---------
+ src/sage/rings/asymptotic/term_monoid.py | 4 +--
+ src/sage/rings/integer.pyx | 2 +-
+ src/sage/rings/rational.pyx | 4 +--
+ src/sage/schemes/elliptic_curves/ell_point.py | 2 +-
+ src/sage/symbolic/constants_c.pyx | 6 ++---
+ src/sage/symbolic/expression.pyx | 31 ++++++++++------------
+ src/sage/tests/french_book/calculus_doctest.py | 2 +-
+ 13 files changed, 51 insertions(+), 48 deletions(-)
+---
--- a/sage/src/sage/libs/pynac/pynac.pxd
+++ b/sage/src/sage/libs/pynac/pynac.pxd
@@ -97,6 +97,7 @@
@@ -40,7 +71,7 @@ Subject: 23950: update interface
GEx n, GEx a, GEx b, int* p) except +
--- a/sage/src/sage/symbolic/expression.pyx
+++ b/sage/src/sage/symbolic/expression.pyx
-@@ -3248,11 +3248,8 @@
+@@ -3286,11 +3286,8 @@
-1
sage: b = -x*A; c = b*b; c
1/4*x^2*(sqrt(5) + I*sqrt(2*sqrt(5) + 10) - 1)
@@ -53,7 +84,7 @@ Subject: 23950: update interface
::
-@@ -3309,17 +3306,17 @@
+@@ -3347,17 +3344,17 @@
sage: ex.substitute(r1=z, r2=z)
-(c1 + z*c2 + z)/c3
@@ -76,7 +107,7 @@ Subject: 23950: update interface
The leading coefficient is a negative number. The normalization process
tries to convert it to a positive number and extract the content, by
-@@ -3926,7 +3923,7 @@
+@@ -3964,7 +3961,7 @@
sage: 0^1.0
0.000000000000000
sage: exp(x)^1.0
@@ -85,25 +116,25 @@ Subject: 23950: update interface
Check that :trac:`23921` is resolved::
-@@ -6336,7 +6333,7 @@
- 0
- """
+@@ -6416,7 +6413,7 @@
cdef Expression ss = self.coerce_in(s)
-- return self._gobj.ldegree(ss._gobj)
-+ return new_Expression_from_GEx(self._parent, GEx(self._gobj.ldegree(ss._gobj)))
-
- def degree(self, s):
- """
-@@ -6362,7 +6359,7 @@
- 0
- """
+ sig_on()
+ try:
+- return self._gobj.ldegree(ss._gobj)
++ return new_Expression_from_GEx(self._parent, GEx(self._gobj.ldegree(ss._gobj)))
+ finally:
+ sig_off()
+
+@@ -6446,7 +6443,7 @@
cdef Expression ss = self.coerce_in(s)
-- return self._gobj.degree(ss._gobj)
-+ return new_Expression_from_GEx(self._parent, GEx(self._gobj.degree(ss._gobj)))
-
- def unit(self, s):
- """
-@@ -7210,12 +7207,12 @@
+ sig_on()
+ try:
+- return self._gobj.degree(ss._gobj)
++ return new_Expression_from_GEx(self._parent, GEx(self._gobj.degree(ss._gobj)))
+ finally:
+ sig_off()
+
+@@ -7318,12 +7315,12 @@
sage: f.collect(z)
(x^2*y^2 + 4)*z^2 + 4*x*y + 20*y^2 + (x + 21*y)*z
@@ -119,7 +150,7 @@ Subject: 23950: update interface
sage: f.expand().collect(x)
x^2 + x*(y - z) - y*z
-@@ -10458,9 +10455,9 @@
+@@ -10597,9 +10594,9 @@
``x*log(9)`` is contracted only if ``algorithm`` is ``'all'``::
sage: (x*log(9)).simplify_log()
@@ -131,7 +162,7 @@ Subject: 23950: update interface
TESTS:
-@@ -10575,7 +10572,7 @@
+@@ -10714,7 +10711,7 @@
To expand also log(3/4) use ``algorithm='all'``::
sage: (log(3/4*x^pi)).log_expand('all')
@@ -140,7 +171,7 @@ Subject: 23950: update interface
To expand only the power use ``algorithm='powers'``.::
-@@ -10598,7 +10595,7 @@
+@@ -10737,7 +10734,7 @@
pi*log(x) + log(3/4)
sage: (log(3/4*x^pi)).log_expand('all')
diff --git a/debian/patches/u1-version-pbori-boost1.62-hashes.patch b/debian/patches/u1-version-pbori-boost1.62-hashes.patch
index 4d8a34f..5bb9e4b 100644
--- a/debian/patches/u1-version-pbori-boost1.62-hashes.patch
+++ b/debian/patches/u1-version-pbori-boost1.62-hashes.patch
@@ -11,7 +11,7 @@ Forwarded: https://trac.sagemath.org/ticket/22243
--- a/sage/src/sage/rings/polynomial/pbori.pyx
+++ b/sage/src/sage/rings/polynomial/pbori.pyx
-@@ -2378,8 +2378,8 @@
+@@ -2379,8 +2379,8 @@
sage: B.<x,y> = BooleanPolynomialRing()
sage: m = x.lm()
sage: m.stable_hash()
@@ -22,7 +22,7 @@ Forwarded: https://trac.sagemath.org/ticket/22243
.. NOTE::
-@@ -4652,8 +4652,8 @@
+@@ -4653,8 +4653,8 @@
sage: B.<x,y> = BooleanPolynomialRing()
sage: x.stable_hash()
@@ -33,7 +33,7 @@ Forwarded: https://trac.sagemath.org/ticket/22243
.. NOTE::
-@@ -5747,8 +5747,8 @@
+@@ -5748,8 +5748,8 @@
sage: B.<x,y> = BooleanPolynomialRing()
sage: s = x.set()
sage: s.stable_hash()
--
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