[sagemath] 01/01: Move some patches to more suitable locations
Ximin Luo
infinity0 at debian.org
Sat Oct 15 11:55:04 UTC 2016
This is an automated email from the git hooks/post-receive script.
infinity0 pushed a commit to branch master
in repository sagemath.
commit e8894e8d00875b06fbcc2472f73db5c512df0915
Author: Ximin Luo <infinity0 at debian.org>
Date: Sat Oct 15 13:52:13 2016 +0200
Move some patches to more suitable locations
---
debian/patches/debian-install-paths.patch | 20 ++++++++++++
debian/patches/debian-paths.patch | 38 ++++++++++++++++++++++
debian/patches/debian-sage-env.patch | 38 ----------------------
.../fixsage-allow-override-sage-local.patch | 20 ------------
debian/patches/series | 1 -
5 files changed, 58 insertions(+), 59 deletions(-)
diff --git a/debian/patches/debian-install-paths.patch b/debian/patches/debian-install-paths.patch
index 50862f5..17b8dc4 100644
--- a/debian/patches/debian-install-paths.patch
+++ b/debian/patches/debian-install-paths.patch
@@ -148,6 +148,26 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
....: number=1, repeat=1)
1 loops, best of 1: 29.6 ms per loop
"""
+--- a/sage/src/sage/doctest/sources.py
++++ b/sage/src/sage/doctest/sources.py
+@@ -32,7 +32,7 @@
+ from .parsing import SageDocTestParser
+ from .util import NestedName
+ from sage.structure.dynamic_class import dynamic_class
+-from sage.env import SAGE_SRC, SAGE_LOCAL
++from sage.env import SAGE_SRC, SAGE_LOCAL, SAGE_LIB
+
+ # Python file parsing
+ triple_quotes = re.compile("\s*[rRuU]*((''')|(\"\"\"))")
+@@ -85,7 +85,7 @@
+ # If the file is in the sage library, we can use our knowledge of
+ # the directory structure
+ dev = SAGE_SRC
+- sp = os.path.join(SAGE_LOCAL, 'lib', 'python', 'site-packages')
++ sp = SAGE_LIB
+ if path.startswith(dev):
+ # there will be a branch name
+ i = path.find(os.path.sep, len(dev))
--- a/sage/src/sage/interacts/debugger.py
+++ b/sage/src/sage/interacts/debugger.py
@@ -194,9 +194,9 @@
diff --git a/debian/patches/debian-paths.patch b/debian/patches/debian-paths.patch
index a0d60da..80cb7fb 100644
--- a/debian/patches/debian-paths.patch
+++ b/debian/patches/debian-paths.patch
@@ -15,6 +15,44 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
sage: (pr, pw) = os.pipe()
sage: r, w, x, t = PSelecter().pselect([f,g,pr,pw], [pw], [pr,pw])
sage: len(r), len(w), len(x), t
+--- a/sage/src/bin/sage-env
++++ b/sage/src/bin/sage-env
+@@ -315,12 +315,12 @@
+ fi
+
+ # For PARI/GP
+-GP_DATA_DIR="$SAGE_LOCAL/share/pari" && export GP_DATA_DIR
+-GPHELP="$SAGE_LOCAL/bin/gphelp" && export GPHELP
+-GPDOCDIR="$SAGE_LOCAL/share/pari/doc" && export GPDOCDIR
++GP_DATA_DIR="/usr/share/pari" && export GP_DATA_DIR
++GPHELP="/usr/bin/gphelp" && export GPHELP
++GPDOCDIR="/usr/share/pari/doc" && export GPDOCDIR
+
+-SINGULARPATH="$SAGE_LOCAL/share/singular" && export SINGULARPATH
+-SINGULAR_EXECUTABLE="$SAGE_LOCAL/bin/Singular" && export SINGULAR_EXECUTABLE
++SINGULARPATH="/usr/share/singular" && export SINGULARPATH
++SINGULAR_EXECUTABLE="/usr/bin/Singular" && export SINGULAR_EXECUTABLE
+
+ if [ -z "$SAGE_REPO_ANONYMOUS" ]; then
+ SAGE_REPO_ANONYMOUS="git://trac.sagemath.org/sage.git"
+@@ -445,7 +445,6 @@
+ fi
+ fi
+ fi
+-MAXIMA_PREFIX="$SAGE_ROOT/local" && export MAXIMA_PREFIX
+
+ PERL5LIB="$SAGE_LOCAL/lib/perl5:$PERL5LIB" && export PERL5LIB
+
+@@ -614,9 +613,6 @@
+ LD_LIBRARY_PATH="$SAGE_LOCAL/bin:$LD_LIBRARY_PATH" && export LD_LIBRARY_PATH
+ fi
+
+-# See trac 7186 -- this is needed if ecl is moved
+-ECLDIR="$SAGE_LOCAL/lib/ecl/" && export ECLDIR
+-
+ # Handle parallel building/testing/...
+ # See Trac Ticket #12016
+ # First, figure out the right values for SAGE_NUM_THREADS (default
--- a/sage/src/sage/interfaces/gap.py
+++ b/sage/src/sage/interfaces/gap.py
@@ -194,7 +194,7 @@
diff --git a/debian/patches/debian-sage-env.patch b/debian/patches/debian-sage-env.patch
deleted file mode 100644
index 29213ce..0000000
--- a/debian/patches/debian-sage-env.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- a/sage/src/bin/sage-env
-+++ b/sage/src/bin/sage-env
-@@ -315,12 +315,12 @@
- fi
-
- # For PARI/GP
--GP_DATA_DIR="$SAGE_LOCAL/share/pari" && export GP_DATA_DIR
--GPHELP="$SAGE_LOCAL/bin/gphelp" && export GPHELP
--GPDOCDIR="$SAGE_LOCAL/share/pari/doc" && export GPDOCDIR
-+GP_DATA_DIR="/usr/share/pari" && export GP_DATA_DIR
-+GPHELP="/usr/bin/gphelp" && export GPHELP
-+GPDOCDIR="/usr/share/pari/doc" && export GPDOCDIR
-
--SINGULARPATH="$SAGE_LOCAL/share/singular" && export SINGULARPATH
--SINGULAR_EXECUTABLE="$SAGE_LOCAL/bin/Singular" && export SINGULAR_EXECUTABLE
-+SINGULARPATH="/usr/share/singular" && export SINGULARPATH
-+SINGULAR_EXECUTABLE="/usr/bin/Singular" && export SINGULAR_EXECUTABLE
-
- if [ -z "$SAGE_REPO_ANONYMOUS" ]; then
- SAGE_REPO_ANONYMOUS="git://trac.sagemath.org/sage.git"
-@@ -445,7 +445,6 @@
- fi
- fi
- fi
--MAXIMA_PREFIX="$SAGE_ROOT/local" && export MAXIMA_PREFIX
-
- PERL5LIB="$SAGE_LOCAL/lib/perl5:$PERL5LIB" && export PERL5LIB
-
-@@ -614,9 +613,6 @@
- LD_LIBRARY_PATH="$SAGE_LOCAL/bin:$LD_LIBRARY_PATH" && export LD_LIBRARY_PATH
- fi
-
--# See trac 7186 -- this is needed if ecl is moved
--ECLDIR="$SAGE_LOCAL/lib/ecl/" && export ECLDIR
--
- # Handle parallel building/testing/...
- # See Trac Ticket #12016
- # First, figure out the right values for SAGE_NUM_THREADS (default
diff --git a/debian/patches/fixsage-allow-override-sage-local.patch b/debian/patches/fixsage-allow-override-sage-local.patch
index 889c402..65b4759 100644
--- a/debian/patches/fixsage-allow-override-sage-local.patch
+++ b/debian/patches/fixsage-allow-override-sage-local.patch
@@ -93,23 +93,3 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
SAGE_INST=${ac_abs_top_builddir}/local/var/lib/sage/installed
for d in "$SAGE_LOGS" "$SAGE_LOCAL" \
"$SAGE_LOCAL/bin" "$SAGE_LOCAL/etc" \
---- a/sage/src/sage/doctest/sources.py
-+++ b/sage/src/sage/doctest/sources.py
-@@ -32,7 +32,7 @@
- from .parsing import SageDocTestParser
- from .util import NestedName
- from sage.structure.dynamic_class import dynamic_class
--from sage.env import SAGE_SRC, SAGE_LOCAL
-+from sage.env import SAGE_SRC, SAGE_LOCAL, SAGE_LIB
-
- # Python file parsing
- triple_quotes = re.compile("\s*[rRuU]*((''')|(\"\"\"))")
-@@ -85,7 +85,7 @@
- # If the file is in the sage library, we can use our knowledge of
- # the directory structure
- dev = SAGE_SRC
-- sp = os.path.join(SAGE_LOCAL, 'lib', 'python', 'site-packages')
-+ sp = SAGE_LIB
- if path.startswith(dev):
- # there will be a branch name
- i = path.find(os.path.sep, len(dev))
diff --git a/debian/patches/series b/debian/patches/series
index 7b2004e..82205f9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -37,7 +37,6 @@ debian-nauty.patch
debian-gsl-cblas.patch
debian-arb.patch
debian-cython-sys-path.patch
-debian-sage-env.patch
debian-octave.patch
debian-sage-gap-reset.patch
# this next one contains some stuff that should be forwarded upstream
--
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