[sagemath] 02/03: Remove 2 patches applied upstream, refresh some others.
Tobias Hansen
thansen at moszumanska.debian.org
Thu Jun 29 12:58:33 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 884777cfc6806ffc45ef16eb93e8e596578a6a10
Author: Tobias Hansen <thansen at debian.org>
Date: Thu Jun 29 07:40:49 2017 +0000
Remove 2 patches applied upstream, refresh some others.
---
debian/changelog | 3 +-
debian/patches/d0-arb.patch | 2 +-
debian/patches/d0-maxima.patch | 4 +-
debian/patches/d0-paths.patch | 2 +-
debian/patches/d0-rubiks.patch | 6 +--
debian/patches/d1-install-paths.patch | 2 +-
debian/patches/d1-sage-cli.patch | 48 +++++------------
debian/patches/d1-sage-env.patch | 2 +-
debian/patches/series | 2 -
debian/patches/u0-version-pynac-0.7.8.patch | 61 ----------------------
debian/patches/u1-fix-use-lexists-not-exists.patch | 17 ------
debian/patches/u1-scripts-dir.patch | 2 +-
.../patches/u2-fix-less-trivial-test-cases.patch | 2 +-
13 files changed, 25 insertions(+), 128 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 1a8d74e..5cdb3ad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,7 @@ sagemath (8.0~beta12-1) UNRELEASED; urgency=medium
- u0-version-r-3.3.3.patch
- u0-version-singular-4.1.0p2.patch
- u0-version-singular-4.1.0p3.patch
+ - u1-fix-use-lexists-not-exists.patch
- u1-version-ecm-7.patch
- u1-version-planarity-3.patch
- df-sagedoc_avoid_exception.patch
@@ -30,8 +31,6 @@ sagemath (8.0~beta12-1) UNRELEASED; urgency=medium
- d0-singular.patch
- d1-install-paths.patch
- d1-sage-env.patch
- * New patches:
- - u0-version-pynac-0.7.8.patch
-- Tobias Hansen <thansen at debian.org> Thu, 08 Jun 2017 21:19:49 +0000
diff --git a/debian/patches/d0-arb.patch b/debian/patches/d0-arb.patch
index 3e77bf9..ae12626 100644
--- a/debian/patches/d0-arb.patch
+++ b/debian/patches/d0-arb.patch
@@ -15,7 +15,7 @@ Forwarded: not-needed
"brial",
"brial_groebner",
"m4rie",
-@@ -807,7 +807,7 @@
+@@ -805,7 +805,7 @@
Extension("sage.matrix.matrix_complex_ball_dense",
["sage/matrix/matrix_complex_ball_dense.pyx"],
diff --git a/debian/patches/d0-maxima.patch b/debian/patches/d0-maxima.patch
index e8eec81..e5a0717 100644
--- a/debian/patches/d0-maxima.patch
+++ b/debian/patches/d0-maxima.patch
@@ -56,7 +56,7 @@ Author: Tobias Hansen <thansen at debian.org>
return AsciiArtString(res)
else:
subprocess.Popen(cmd, shell=True)
-@@ -2188,7 +2185,7 @@
+@@ -2189,7 +2186,7 @@
sage: maxima_version()
'5.39.0'
"""
@@ -65,7 +65,7 @@ Author: Tobias Hansen <thansen at debian.org>
def maxima_console():
"""
-@@ -2204,4 +2201,4 @@
+@@ -2205,4 +2202,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/d0-paths.patch b/debian/patches/d0-paths.patch
index 6415c54..85f5f70 100644
--- a/debian/patches/d0-paths.patch
+++ b/debian/patches/d0-paths.patch
@@ -6,7 +6,7 @@ Forwarded: not-needed
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/sage/src/sage/interfaces/gap.py
+++ b/sage/src/sage/interfaces/gap.py
-@@ -194,7 +194,7 @@
+@@ -195,7 +195,7 @@
WORKSPACE = gap_workspace_file()
diff --git a/debian/patches/d0-rubiks.patch b/debian/patches/d0-rubiks.patch
index f36133c..c057cf0 100644
--- a/debian/patches/d0-rubiks.patch
+++ b/debian/patches/d0-rubiks.patch
@@ -4,7 +4,7 @@ Author: Tobias Hansen <thansen at debian.org>
--- a/sage/src/sage/interfaces/rubik.py
+++ b/sage/src/sage/interfaces/rubik.py
-@@ -90,7 +90,7 @@
+@@ -91,7 +91,7 @@
"""
Interface to Michael Reid's optimal Rubik's Cube solver.
"""
@@ -13,7 +13,7 @@ Author: Tobias Hansen <thansen at debian.org>
def __init__(self, verbose=False, wait=True):
self.verbose = verbose
-@@ -178,7 +178,7 @@
+@@ -180,7 +180,7 @@
class CubexSolver:
@@ -22,7 +22,7 @@ Author: Tobias Hansen <thansen at debian.org>
def __call__(self, facets):
return self.solve(facets)
-@@ -232,7 +232,7 @@
+@@ -235,7 +235,7 @@
class DikSolver:
diff --git a/debian/patches/d1-install-paths.patch b/debian/patches/d1-install-paths.patch
index da9e0b1..4b6bd2d 100644
--- a/debian/patches/d1-install-paths.patch
+++ b/debian/patches/d1-install-paths.patch
@@ -208,7 +208,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
- master_static_dir = os.path.join('..', '_static')
+ master_static_dir = os.path.join('..', '..', '_static')
if os.path.lexists(static_dir):
- if os.path.isdir(static_dir) and not os.path.islink(static_dir):
+ try:
shutil.rmtree(static_dir)
--- a/sage/src/Makefile.in
+++ b/sage/src/Makefile.in
diff --git a/debian/patches/d1-sage-cli.patch b/debian/patches/d1-sage-cli.patch
index 488b03b..f3201ae 100644
--- a/debian/patches/d1-sage-cli.patch
+++ b/debian/patches/d1-sage-cli.patch
@@ -258,7 +258,7 @@ Forwarded: not-needed
#####################################################################
# Source sage-env ($0 is the name of this "sage" script, so we can just
-@@ -383,47 +221,14 @@
+@@ -383,29 +221,10 @@
# Prepare for running Sage, either interactively or non-interactively.
sage_setup() {
@@ -276,7 +276,7 @@ Forwarded: not-needed
+ cat "/usr/share/sagemath/bin/sage-banner"
fi
-- # Display the startup banner (unless SAGE_BANNER is explictly "no")
+- # Display the startup banner (unless SAGE_BANNER is explicitly "no")
- sage_banner
-
- maybe_sage_location
@@ -290,25 +290,7 @@ Forwarded: not-needed
sage-cleaner &>/dev/null &
}
-
--# Check to see if the whole Sage install tree has moved. If so,
--# change various hardcoded paths. Skip this if we don't have write
--# access to $SAGE_LOCAL (e.g. when running as a different user) or
--# if Python and sage-location haven't been installed yet.
--maybe_sage_location()
--{
-- if [ -w "$SAGE_LOCAL" ]; then
-- if [ -x "$SAGE_LOCAL/bin/python" ] && [ -x "$SAGE_LOCAL/bin/sage-location" ]; then
-- sage-location || exit $?
-- fi
-- fi
--}
--
--
- # Start an interactive Sage session, this function never returns.
- interactive_sage() {
- sage_setup
-@@ -483,11 +288,6 @@
+@@ -483,11 +302,6 @@
exec gap "$@"
fi
@@ -320,7 +302,7 @@ Forwarded: not-needed
if [ "$1" = '-gp' -o "$1" = '--gp' ]; then
shift
exec gp "$@"
-@@ -533,11 +333,6 @@
+@@ -533,11 +347,6 @@
exec kash "$@"
fi
@@ -332,7 +314,7 @@ Forwarded: not-needed
if [ "$1" = '-maxima' -o "$1" = '--maxima' ]; then
shift
exec maxima-sage "$@"
-@@ -553,21 +348,6 @@
+@@ -553,21 +362,6 @@
exec M2 "$@"
fi
@@ -354,7 +336,7 @@ Forwarded: not-needed
if [ "$1" = '-python' -o "$1" = '--python' ]; then
shift
exec python "$@"
-@@ -598,11 +378,6 @@
+@@ -598,11 +392,6 @@
exec git "$@"
fi
@@ -366,7 +348,7 @@ Forwarded: not-needed
if [ "$1" = '-sh' -o "$1" = '--sh' ]; then
# AUTHORS:
# - Carl Witty and William Stein: initial version
-@@ -722,20 +497,6 @@
+@@ -722,20 +511,6 @@
fi
#####################################################################
@@ -387,7 +369,7 @@ Forwarded: not-needed
# File conversion
#####################################################################
-@@ -758,11 +519,6 @@
+@@ -758,11 +533,6 @@
# Run Sage's versions of the standard Algebra/Geometry etc. software
#####################################################################
@@ -399,7 +381,7 @@ Forwarded: not-needed
if [[ "$1" =~ ^--notebook=.* || "$1" =~ ^-n=.* || "$1" =~ ^-notebook=.* ]] ; then
sage-cleaner &>/dev/null &
exec sage-notebook "$@"
-@@ -773,13 +529,6 @@
+@@ -773,13 +543,6 @@
exec sage-notebook "$@"
fi
@@ -413,7 +395,7 @@ Forwarded: not-needed
if [ "$1" = "-inotebook" -o "$1" = '--inotebook' ]; then
shift
sage-cleaner &>/dev/null &
-@@ -798,38 +547,19 @@
+@@ -798,34 +561,15 @@
exit 0
fi
@@ -443,10 +425,6 @@ Forwarded: not-needed
- build_sage
- fi
+if [ "$1" = '-t' -o "$1" = '-tp' ]; then
- if [ ! -f "$DOT_SAGE"/init.sage ]; then
- echo >&2 "init.sage does not exist ... creating"
- touch "$DOT_SAGE"/init.sage
- fi
SAGE_BANNER=no sage_setup
export PYTHONIOENCODING="utf-8" # Fix encoding for doctests
- if [ "$1" = '-tp' -o "$1" = '-btp' ]; then
@@ -454,7 +432,7 @@ Forwarded: not-needed
shift
exec sage-runtests -p "$@"
else
-@@ -838,16 +568,6 @@
+@@ -834,16 +578,6 @@
fi
fi
@@ -471,7 +449,7 @@ Forwarded: not-needed
if [ "$1" = '-testall' -o "$1" = "--testall" ]; then
shift
SAGE_BANNER=no sage_setup
-@@ -862,114 +582,6 @@
+@@ -858,114 +592,6 @@
exec sage-eval "$@"
fi
@@ -586,7 +564,7 @@ Forwarded: not-needed
if [ "$1" = "-docbuild" -o "$1" = "--docbuild" ]; then
shift
exec python -m "sage_setup.docbuild" "$@"
-@@ -1041,10 +653,6 @@
+@@ -1037,10 +663,6 @@
fi
if [ $# -ge 1 ]; then
diff --git a/debian/patches/d1-sage-env.patch b/debian/patches/d1-sage-env.patch
index 89a4b58..99de714 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
-@@ -1593,7 +1593,7 @@
+@@ -1595,7 +1595,7 @@
When run with no arguments :meth:`unpickle_all` tests that all of the
"standard" pickles stored in the pickle_jar at
diff --git a/debian/patches/series b/debian/patches/series
index 3dd3e9a..9c9e93c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,9 +2,7 @@
# Or nearly-finished patches that they'll very probably merge.
# Patches that have open upstream tickets
-u0-version-pynac-0.7.8.patch
u1-version-pbori-boost1.62-hashes.patch #22243
-u1-fix-use-lexists-not-exists.patch #22438
u1-fix-dont-require-DISPLAY.patch #22441
u1-pip-nowarn.patch #21835
u1-fix-atrocious-symlink-logic.patch #22444
diff --git a/debian/patches/u0-version-pynac-0.7.8.patch b/debian/patches/u0-version-pynac-0.7.8.patch
deleted file mode 100644
index 5393592..0000000
--- a/debian/patches/u0-version-pynac-0.7.8.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 31340eabeb342b4411f612fd5f3dd5702a1898e3 Mon Sep 17 00:00:00 2001
-From: Ralf Stephan <ralf at ark.in-berlin.de>
-Date: Sat, 3 Jun 2017 10:24:04 +0200
-Subject: 23134: doctest fixes
-
----
- src/sage/symbolic/expression.pyx | 14 +++++++++-----
- 1 file changed, 9 insertions(+), 5 deletions(-)
-
---- a/sage/src/sage/symbolic/expression.pyx
-+++ b/sage/src/sage/symbolic/expression.pyx
-@@ -114,7 +114,9 @@
-
- Test if :trac:`9947` is fixed::
-
-- sage: real_part(1+2*(sqrt(2)+1)*(sqrt(2)-1))
-+ sage: r=real_part(1+2*(sqrt(2)+1)*(sqrt(2)-1)); r
-+ 2*(sqrt(2) + 1)*(sqrt(2) - 1) + 1
-+ sage: r.expand()
- 3
- sage: a=(sqrt(4*(sqrt(3) - 5)*(sqrt(3) + 5) + 48) + 4*sqrt(3))/ (sqrt(3) + 5)
- sage: a.real_part()
-@@ -1224,7 +1226,7 @@
- sage: f._convert({'parent':RDF})
- -1.40006081533995
- sage: f._convert({'parent':float})
-- -1.40006081533995
-+ -1.4000608153399503
-
- There is nothing to convert for variables::
-
-@@ -1238,7 +1240,7 @@
- sage: t = log(10); t
- log(10)
- sage: t._convert({'parent':ZZ})
-- 2.30258509299405
-+ log(10)
-
- ::
-
-@@ -1251,8 +1253,10 @@
-
- sage: f = sqrt(2) * cos(3); f
- sqrt(2)*cos(3)
-+ sage: (sqrt(2))._convert({'parent':int})
-+ sqrt(2)
- sage: f._convert({'parent':int})
-- -0.989992496600445*sqrt(2)
-+ 0
- """
- cdef GEx res = self._gobj.evalf(0, kwds)
- return new_Expression_from_GEx(self._parent, res)
-@@ -1843,7 +1847,7 @@
-
- sage: f = x+2 > sqrt(3)
- sage: f._maxima_init_assume_()
-- '((_SAGE_VAR_x)+(2))>((3/1)^(1/2))'
-+ '((_SAGE_VAR_x)+(2))>((3)^(1/2))'
- """
- from sage.calculus.calculus import maxima
-
diff --git a/debian/patches/u1-fix-use-lexists-not-exists.patch b/debian/patches/u1-fix-use-lexists-not-exists.patch
deleted file mode 100644
index 11d2778..0000000
--- a/debian/patches/u1-fix-use-lexists-not-exists.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Use lexists instead of exists
- os.path.exists returns False for a broken symlink; we want lexists here
-Author: Ximin Luo <infinity0 at debian.org>
-Bug: https://trac.sagemath.org/ticket/22438
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/sage/src/sage_setup/docbuild/ext/multidocs.py
-+++ b/sage/src/sage_setup/docbuild/ext/multidocs.py
-@@ -286,7 +286,7 @@
- app.builder.info(bold('linking _static directory.'))
- static_dir = os.path.join(app.builder.outdir, '_static')
- master_static_dir = os.path.join('..', '_static')
-- if os.path.exists(static_dir):
-+ if os.path.lexists(static_dir):
- if os.path.isdir(static_dir) and not os.path.islink(static_dir):
- shutil.rmtree(static_dir)
- else:
diff --git a/debian/patches/u1-scripts-dir.patch b/debian/patches/u1-scripts-dir.patch
index 6a953ec..db90730 100644
--- a/debian/patches/u1-scripts-dir.patch
+++ b/debian/patches/u1-scripts-dir.patch
@@ -31,7 +31,7 @@ Forwarded: TODO
echo "SageMath version ${SAGE_VERSION}, Release Date: ${SAGE_RELEASE_DATE}"
exit 0
fi
-@@ -979,14 +979,14 @@
+@@ -975,14 +975,14 @@
shift
sage_setup
if [ "$SAGE_DEBUG" = "no" ]; then
diff --git a/debian/patches/u2-fix-less-trivial-test-cases.patch b/debian/patches/u2-fix-less-trivial-test-cases.patch
index 7445b01..8c72845 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
-@@ -6089,8 +6089,7 @@
+@@ -6093,8 +6093,7 @@
sage: 1 << (2^60)
Traceback (most recent call last):
...
--
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