[sagemath] 08/10: Refresh more patches (2).
Tobias Hansen
thansen at moszumanska.debian.org
Fri Jun 9 21:34:43 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 0f36694cc5789c6e4762fdf52dbed092541bd8e9
Author: Tobias Hansen <thansen at debian.org>
Date: Fri Jun 9 21:59:49 2017 +0100
Refresh more patches (2).
---
debian/changelog | 1 +
debian/patches/d1-disable-post-install-tests.patch | 2 +-
debian/patches/d1-fakeroot.patch | 2 +-
debian/patches/d1-multiarch-python-paths.patch | 2 +-
debian/patches/d1-sage-env.patch | 37 ++++++++--------------
debian/patches/d1-test-optional.patch | 4 +--
debian/patches/df-python_security.patch | 4 +--
...t-minor-feature-dependent-on-python-patch.patch | 2 +-
8 files changed, 22 insertions(+), 32 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 7261ff5..23e11ad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,7 @@ sagemath (8.0~beta9-1) UNRELEASED; urgency=medium
- d0-paths.patch
- d0-singular.patch
- d1-install-paths.patch
+ - d1-sage-env.patch
-- Tobias Hansen <thansen at debian.org> Thu, 08 Jun 2017 21:19:49 +0000
diff --git a/debian/patches/d1-disable-post-install-tests.patch b/debian/patches/d1-disable-post-install-tests.patch
index 36fb772..a23cbd8 100644
--- a/debian/patches/d1-disable-post-install-tests.patch
+++ b/debian/patches/d1-disable-post-install-tests.patch
@@ -18,7 +18,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
"""
--- a/sage/src/sage/all.py
+++ b/sage/src/sage/all.py
-@@ -272,14 +272,6 @@
+@@ -290,14 +290,6 @@
The non-existence of this file will be used as a trigger to run
``sage-starts`` during the Sage build.
diff --git a/debian/patches/d1-fakeroot.patch b/debian/patches/d1-fakeroot.patch
index e259817..0554568 100644
--- a/debian/patches/d1-fakeroot.patch
+++ b/debian/patches/d1-fakeroot.patch
@@ -4,7 +4,7 @@ Author: Tobias Hansen <thansen at debian.org>
--- a/sage/configure.ac
+++ b/sage/configure.ac
-@@ -89,7 +89,6 @@
+@@ -97,7 +97,6 @@
SAGE_SPKG_INST="$SAGE_ROOT/local/var/lib/sage/installed"
#---------------------------------------------------------
diff --git a/debian/patches/d1-multiarch-python-paths.patch b/debian/patches/d1-multiarch-python-paths.patch
index 971b763..06e991a 100644
--- a/debian/patches/d1-multiarch-python-paths.patch
+++ b/debian/patches/d1-multiarch-python-paths.patch
@@ -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
-@@ -1248,7 +1249,12 @@
+@@ -1243,7 +1244,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 4024b72..fbb12c0 100644
--- a/debian/patches/d1-sage-env.patch
+++ b/debian/patches/d1-sage-env.patch
@@ -7,7 +7,7 @@ Author: Tobias Hansen <thansen at debian.org>, Ximin Luo <infinity0 at debian.org>
--- a/sage/src/bin/sage
+++ b/sage/src/bin/sage
-@@ -201,7 +201,12 @@
+@@ -202,7 +202,12 @@
# append -env to that). We redirect stdout to stderr, which is safer
# for scripts.
#####################################################################
@@ -23,7 +23,7 @@ Author: Tobias Hansen <thansen at debian.org>, Ximin Luo <infinity0 at debian.org>
echo >&2 "possibly contact sage-devel (see http://groups.google.com/group/sage-devel)."
--- a/sage/src/bin/sage-env
+++ b/sage/src/bin/sage-env
-@@ -264,12 +264,12 @@
+@@ -266,12 +266,12 @@
# depending on SAGE_ROOT and SAGE_LOCAL which are already defined.
export SAGE_ETC="$SAGE_LOCAL/etc"
export SAGE_SHARE="$SAGE_LOCAL/share"
@@ -38,7 +38,7 @@ Author: Tobias Hansen <thansen at debian.org>, Ximin Luo <infinity0 at debian.org>
if [ -z "${SAGE_ORIG_PATH_SET}" ]; then
SAGE_ORIG_PATH=$PATH && export SAGE_ORIG_PATH
-@@ -325,12 +325,12 @@
+@@ -327,12 +327,12 @@
fi
# For PARI/GP
@@ -56,7 +56,7 @@ Author: Tobias Hansen <thansen at debian.org>, Ximin Luo <infinity0 at debian.org>
if [ -z "$SAGE_REPO_ANONYMOUS" ]; then
SAGE_REPO_ANONYMOUS="git://trac.sagemath.org/sage.git"
-@@ -345,16 +345,6 @@
+@@ -347,16 +347,6 @@
export SAGE_DISTFILES
fi
@@ -73,8 +73,8 @@ Author: Tobias Hansen <thansen at debian.org>, Ximin Luo <infinity0 at debian.org>
if [ "$DOT_SAGE" = "" ]; then
# It is *not* an error if this directory does not exist, it will
# be created in src/bin/sage or src/sage/misc/misc.py.
-@@ -420,8 +410,10 @@
- export PYTHONHOME
+@@ -417,8 +407,10 @@
+ unset PYTHONHOME
fi
-LDFLAGS="-L$SAGE_LOCAL/lib -Wl,-rpath,$SAGE_LOCAL/lib $LDFLAGS"
@@ -85,7 +85,7 @@ Author: Tobias Hansen <thansen at debian.org>, Ximin Luo <infinity0 at debian.org>
# Use a matplotlib config directory specific to Sage and specific to
# the version number of matplotlib, by setting the environment
-@@ -468,7 +460,6 @@
+@@ -465,7 +457,6 @@
fi
fi
fi
@@ -93,7 +93,7 @@ Author: Tobias Hansen <thansen at debian.org>, Ximin Luo <infinity0 at debian.org>
PERL5LIB="$SAGE_LOCAL/lib/perl5:$PERL5LIB" && export PERL5LIB
-@@ -647,9 +638,6 @@
+@@ -644,9 +635,6 @@
LD_LIBRARY_PATH="$SAGE_LOCAL/bin:$LD_LIBRARY_PATH" && export LD_LIBRARY_PATH
fi
@@ -105,26 +105,15 @@ Author: Tobias Hansen <thansen at debian.org>, Ximin Luo <infinity0 at debian.org>
# First, figure out the right values for SAGE_NUM_THREADS (default
--- a/sage/build/make/install
+++ b/sage/build/make/install
-@@ -11,7 +11,7 @@
+@@ -16,7 +16,7 @@
fi
- export SAGE_SRC="$SAGE_ROOT/src"
+
export SAGE_SHARE="$SAGE_LOCAL/share"
-export SAGE_EXTCODE="$SAGE_SHARE/sage/ext"
+export SAGE_EXTCODE="$SAGE_SHARE/sagemath/ext"
export SAGE_LOGS="$SAGE_ROOT/logs/pkgs"
export SAGE_SPKG_INST="$SAGE_ROOT/local/var/lib/sage/installed"
export SAGE_VERSION=`cat $SAGE_ROOT/VERSION.txt | sed 's+.*\ \(.*\),.*+\1+'`
---- a/sage/configure.ac
-+++ b/sage/configure.ac
-@@ -85,7 +85,7 @@
- fi
- SAGE_SRC="$SAGE_ROOT/src"
- SAGE_SHARE="$SAGE_LOCAL/share"
--SAGE_EXTCODE="$SAGE_SHARE/sage/ext"
-+SAGE_EXTCODE="$SAGE_SHARE/sagemath/ext"
- SAGE_SPKG_INST="$SAGE_ROOT/local/var/lib/sage/installed"
-
- #---------------------------------------------------------
--- a/sage/README.md
+++ b/sage/README.md
@@ -223,7 +223,7 @@
@@ -138,7 +127,7 @@ Author: Tobias Hansen <thansen at debian.org>, Ximin Luo <infinity0 at debian.org>
of the documentation, run:
--- a/sage/build/make/deps
+++ b/sage/build/make/deps
-@@ -230,7 +230,7 @@
+@@ -235,7 +235,7 @@
cd "$(SAGE_SRC)/doc" && $(MAKE) clean
doc-output-clean:
@@ -171,7 +160,7 @@ Author: Tobias Hansen <thansen at debian.org>, Ximin Luo <infinity0 at debian.org>
of the documentation, issue the following command from ``SAGE_ROOT``::
--- a/sage/src/doc/en/installation/source.rst
+++ b/sage/src/doc/en/installation/source.rst
-@@ -830,7 +830,7 @@
+@@ -840,7 +840,7 @@
primarily intended for use when producing certain binary
distributions of Sage, to lower the size of the distribution. As of
this writing (December 2014, Sage 6.5), there are only a few such
@@ -182,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
-@@ -1519,7 +1519,7 @@
+@@ -1548,7 +1548,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/d1-test-optional.patch b/debian/patches/d1-test-optional.patch
index d86d6bf..5d10cb0 100644
--- a/debian/patches/d1-test-optional.patch
+++ b/debian/patches/d1-test-optional.patch
@@ -3,7 +3,7 @@ Origin: https://git.archlinux.org/svntogit/community.git/tree/trunk?h=packages/s
--- a/sage/src/sage/doctest/control.py
+++ b/sage/src/sage/doctest/control.py
-@@ -307,22 +307,6 @@
+@@ -322,22 +322,6 @@
if "all" in options.optional:
# Special case to run all optional tests
options.optional = True
@@ -28,7 +28,7 @@ Origin: https://git.archlinux.org/svntogit/community.git/tree/trunk?h=packages/s
self.files = args
--- a/sage/src/sage/doctest/test.py
+++ b/sage/src/sage/doctest/test.py
-@@ -444,14 +444,6 @@
+@@ -466,14 +466,6 @@
...
0
diff --git a/debian/patches/df-python_security.patch b/debian/patches/df-python_security.patch
index e30fbb4..3aad7d2 100644
--- a/debian/patches/df-python_security.patch
+++ b/debian/patches/df-python_security.patch
@@ -1,6 +1,6 @@
--- a/sage/src/sage/doctest/control.py
+++ b/sage/src/sage/doctest/control.py
-@@ -542,19 +542,20 @@
+@@ -557,19 +557,20 @@
``sage/tests/cmdline.py`` for a doctest that this works, see
also :trac:`13579`.
@@ -35,7 +35,7 @@
with open(os.devnull, 'w') as dev_null:
--- a/sage/src/sage/tests/cmdline.py
+++ b/sage/src/sage/tests/cmdline.py
-@@ -364,23 +364,24 @@
+@@ -365,23 +365,24 @@
sage: ret
1
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 f0ac175..e8f9bde 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
-@@ -754,16 +754,6 @@
+@@ -761,16 +761,6 @@
4
sage: v[Integer(2):Integer(4)]
[3, 4]
--
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