[sagemath] 05/10: Remove obsolete parts of u2-allow-override-sage-local.patch, needs testing.
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 20e73d18a41c56469b4064750a346b238f2e93cf
Author: Tobias Hansen <thansen at debian.org>
Date: Thu Jun 8 23:49:51 2017 +0000
Remove obsolete parts of u2-allow-override-sage-local.patch, needs testing.
---
debian/changelog | 3 ++
debian/patches/d0-arb.patch | 2 +-
debian/patches/d0-cython-sys-path.patch | 14 ++++-----
debian/patches/u2-allow-override-sage-local.patch | 38 +++++------------------
4 files changed, 19 insertions(+), 38 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 2c7f236..b11e1eb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,9 @@ sagemath (8.0~beta9-1) UNRELEASED; urgency=medium
- u0-version-singular-4.1.0p3.patch
- u1-version-ecm-7.patch
- u1-version-planarity-3.patch
+ * Patches with non-trivial modifications:
+ - u2-allow-override-sage-local.patch:
+ May need further modifications after https://trac.sagemath.org/ticket/21479
-- 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 a0ff61a..3e77bf9 100644
--- a/debian/patches/d0-arb.patch
+++ b/debian/patches/d0-arb.patch
@@ -15,7 +15,7 @@ Forwarded: not-needed
"brial",
"brial_groebner",
"m4rie",
-@@ -799,7 +799,7 @@
+@@ -807,7 +807,7 @@
Extension("sage.matrix.matrix_complex_ball_dense",
["sage/matrix/matrix_complex_ball_dense.pyx"],
diff --git a/debian/patches/d0-cython-sys-path.patch b/debian/patches/d0-cython-sys-path.patch
index 419e44c..e726bdb 100644
--- a/debian/patches/d0-cython-sys-path.patch
+++ b/debian/patches/d0-cython-sys-path.patch
@@ -5,17 +5,17 @@ Origin: https://git.archlinux.org/svntogit/community.git/tree/trunk?h=packages/s
--- a/sage/src/setup.py
+++ b/sage/src/setup.py
-@@ -402,6 +402,7 @@
- build_dir=SAGE_CYTHONIZED,
- force=force,
+@@ -416,6 +416,7 @@
+ build_dir=self.build_dir,
+ force=self.force,
aliases=aliases,
+ include_path=sys.path,
- compiler_directives={
- 'autotestdict': False,
- 'cdivision': True,
+ compiler_directives=self.cython_directives,
+ compile_time_env={'PY_VERSION_HEX':sys.hexversion},
+ create_extension=sage_create_extension,
--- a/sage/src/sage/misc/cython.py
+++ b/sage/src/sage/misc/cython.py
-@@ -245,6 +245,7 @@
+@@ -281,6 +281,7 @@
# Add cysignals directory to includes
for path in sys.path:
diff --git a/debian/patches/u2-allow-override-sage-local.patch b/debian/patches/u2-allow-override-sage-local.patch
index 8321138..c89cfa3 100644
--- a/debian/patches/u2-allow-override-sage-local.patch
+++ b/debian/patches/u2-allow-override-sage-local.patch
@@ -8,9 +8,9 @@ Forwarded: TODO
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/sage/sage
+++ b/sage/sage
-@@ -134,6 +134,8 @@
- exec "$SAGE_ROOT/src/bin/sage" "$@"
+@@ -133,6 +133,8 @@
elif [ -x "$SAGE_ROOT/local/bin/sage" ]; then # if in a stripped binary
+ # Note in this case we assume that SAGE_LOCAL is the "local" subdirectory
exec "$SAGE_ROOT/local/bin/sage" "$@"
+elif [ -x "$SAGE_LOCAL/bin/sage" ]; then # if in a stripped binary
+ exec "$SAGE_LOCAL/bin/sage" "$@"
@@ -19,16 +19,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
exit 1
--- a/sage/src/bin/sage-env
+++ b/sage/src/bin/sage-env
-@@ -187,7 +187,7 @@
-
- # SAGE_LOCAL is the installation prefix and can be customized
- if [ -z "$SAGE_LOCAL" ]; then
-- export SAGE_LOCAL="$SAGE_ROOT/local"
-+ export SAGE_LOCAL="${SAGE_LOCAL:-$SAGE_ROOT/local}"
- fi
-
- # sage-env must know where the Sage's script files are
-@@ -265,7 +265,7 @@
+@@ -267,7 +267,7 @@
export SAGE_ETC="$SAGE_LOCAL/etc"
export SAGE_SHARE="$SAGE_LOCAL/share"
export SAGE_EXTCODE="$SAGE_SHARE/sage/ext"
@@ -48,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
-@@ -114,7 +114,7 @@
+@@ -115,7 +115,7 @@
_add_variable_or_fallback('SAGE_EXTCODE', opj('$SAGE_SHARE', 'sage', 'ext'))
_add_variable_or_fallback('SAGE_LOGS', opj('$SAGE_ROOT', 'logs', 'pkgs'))
@@ -59,14 +50,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
_add_variable_or_fallback('DOT_SAGE', opj(os.environ.get('HOME','$SAGE_ROOT'), '.sage'))
--- a/sage/build/make/install
+++ b/sage/build/make/install
-@@ -7,13 +7,13 @@
- # Assume current directory is SAGE_ROOT/build/make
- export SAGE_ROOT=`cd ../.. && pwd -P`
- if [ -z "$SAGE_LOCAL" ]; then
-- export SAGE_LOCAL="$SAGE_ROOT/local"
-+ export SAGE_LOCAL="${SAGE_LOCAL:-SAGE_ROOT/local}"
- fi
- export SAGE_SRC="$SAGE_ROOT/src"
+@@ -18,7 +18,7 @@
export SAGE_SHARE="$SAGE_LOCAL/share"
export SAGE_EXTCODE="$SAGE_SHARE/sage/ext"
export SAGE_LOGS="$SAGE_ROOT/logs/pkgs"
@@ -75,7 +59,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
export SAGE_VERSION=`cat $SAGE_ROOT/VERSION.txt | sed 's+.*\ \(.*\),.*+\1+'`
if [ -z "${SAGE_ORIG_PATH_SET}" ]; then
-@@ -22,7 +22,7 @@
+@@ -27,7 +27,7 @@
fi
export PATH="$SAGE_ROOT/build/bin:$SAGE_SRC/bin:$SAGE_LOCAL/bin:$PATH"
@@ -86,16 +70,10 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
# seconds since 1970-01-01 in a hidden file called
--- a/sage/configure.ac
+++ b/sage/configure.ac
-@@ -81,12 +81,12 @@
- # Assume current directory is SAGE_ROOT
- SAGE_ROOT=`pwd -P`
- if test -z "$SAGE_LOCAL"; then
-- SAGE_LOCAL="$SAGE_ROOT/local"
-+ SAGE_LOCAL="${SAGE_LOCAL:-$SAGE_ROOT/local}"
+@@ -94,7 +94,7 @@
+ SAGE_LOCAL=local
fi
SAGE_SRC="$SAGE_ROOT/src"
- SAGE_SHARE="$SAGE_LOCAL/share"
- SAGE_EXTCODE="$SAGE_SHARE/sage/ext"
-SAGE_SPKG_INST="$SAGE_LOCAL/var/lib/sage/installed"
+SAGE_SPKG_INST="$SAGE_ROOT/local/var/lib/sage/installed"
--
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