[sagemath] 01/01: Patch sage-env only in two patches instead of four.
Tobias Hansen
thansen at moszumanska.debian.org
Sat Aug 6 18:44:33 UTC 2016
This is an automated email from the git hooks/post-receive script.
thansen pushed a commit to branch master
in repository sagemath.
commit 50c75759fc94c861e6363e05744abe7ee155b23e
Author: Tobias Hansen <thansen at debian.org>
Date: Sat Aug 6 19:43:18 2016 +0100
Patch sage-env only in two patches instead of four.
---
debian/patches/debian-pari.patch | 15 -----------
debian/patches/debian-paths.patch | 31 -----------------------
debian/patches/debian-sage-env.patch | 49 ++++++++++++++++++++++++++++++++++++
debian/patches/debian-singular.patch | 13 ----------
debian/patches/series | 1 +
5 files changed, 50 insertions(+), 59 deletions(-)
diff --git a/debian/patches/debian-pari.patch b/debian/patches/debian-pari.patch
index b9bfea1..7e3fcea 100644
--- a/debian/patches/debian-pari.patch
+++ b/debian/patches/debian-pari.patch
@@ -1,18 +1,3 @@
---- a/sage/src/bin/sage-env
-+++ b/sage/src/bin/sage-env
-@@ -309,9 +309,9 @@
- 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="/usr/share/singular" && export SINGULARPATH
- SINGULAR_EXECUTABLE="/usr/bin/Singular" && export SINGULAR_EXECUTABLE
--- a/sage/src/sage/interfaces/gp.py
+++ b/sage/src/sage/interfaces/gp.py
@@ -245,9 +245,9 @@
diff --git a/debian/patches/debian-paths.patch b/debian/patches/debian-paths.patch
index 100739a..218fa3c 100644
--- a/debian/patches/debian-paths.patch
+++ b/debian/patches/debian-paths.patch
@@ -27,37 +27,6 @@
# Display the startup banner
if [ "$SAGE_BANNER" = "bare" ]; then
---- a/sage/src/bin/sage-env
-+++ b/sage/src/bin/sage-env
-@@ -247,8 +247,8 @@
- # Setting Sage-related location environment variables.
- export SAGE_LOCAL="$SAGE_ROOT/local"
- export SAGE_ETC="$SAGE_LOCAL/etc"
--export SAGE_SHARE="$SAGE_LOCAL/share"
--export SAGE_EXTCODE="$SAGE_SHARE/sage/ext"
-+export SAGE_SHARE="/usr/share/sagemath"
-+export SAGE_EXTCODE="$SAGE_LOCAL/share/sage/ext"
- export SAGE_SPKG_INST="$SAGE_LOCAL/var/lib/sage/installed"
- export SAGE_LOGS="$SAGE_ROOT/logs/pkgs"
- export SAGE_SRC="$SAGE_ROOT/src"
-@@ -439,7 +439,6 @@
- fi
- fi
- fi
--MAXIMA_PREFIX="$SAGE_ROOT/local" && export MAXIMA_PREFIX
-
- ############ architecture flags
-
-@@ -606,9 +605,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/module_list.py
+++ b/sage/src/module_list.py
@@ -3,7 +3,7 @@
diff --git a/debian/patches/debian-sage-env.patch b/debian/patches/debian-sage-env.patch
new file mode 100644
index 0000000..37b6a02
--- /dev/null
+++ b/debian/patches/debian-sage-env.patch
@@ -0,0 +1,49 @@
+--- a/sage/src/bin/sage-env
++++ b/sage/src/bin/sage-env
+@@ -247,8 +247,8 @@
+ # Setting Sage-related location environment variables.
+ export SAGE_LOCAL="$SAGE_ROOT/local"
+ export SAGE_ETC="$SAGE_LOCAL/etc"
+-export SAGE_SHARE="$SAGE_LOCAL/share"
+-export SAGE_EXTCODE="$SAGE_SHARE/sage/ext"
++export SAGE_SHARE="/usr/share/sagemath"
++export SAGE_EXTCODE="$SAGE_LOCAL/share/sage/ext"
+ export SAGE_SPKG_INST="$SAGE_LOCAL/var/lib/sage/installed"
+ export SAGE_LOGS="$SAGE_ROOT/logs/pkgs"
+ export SAGE_SRC="$SAGE_ROOT/src"
+@@ -309,12 +309,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"
+@@ -439,7 +439,6 @@
+ fi
+ fi
+ fi
+-MAXIMA_PREFIX="$SAGE_ROOT/local" && export MAXIMA_PREFIX
+
+ ############ architecture flags
+
+@@ -606,9 +605,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/debian-singular.patch b/debian/patches/debian-singular.patch
index 7de60ba..ee6694f 100644
--- a/debian/patches/debian-singular.patch
+++ b/debian/patches/debian-singular.patch
@@ -56,16 +56,3 @@
... "#clib m readline singular givaro ntl gmpxx gmp",
... "from sage.rings.polynomial.multi_polynomial_libsingular cimport MPolynomial_libsingular",
... "from sage.libs.singular.polynomial cimport singular_polynomial_pow",
---- a/sage/src/bin/sage-env
-+++ b/sage/src/bin/sage-env
-@@ -313,8 +313,8 @@
- GPHELP="$SAGE_LOCAL/bin/gphelp" && export GPHELP
- GPDOCDIR="$SAGE_LOCAL/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"
diff --git a/debian/patches/series b/debian/patches/series
index edce7f5..4cb6be5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -26,6 +26,7 @@ debian-gsl-cblas.patch
debian-cysignals.patch
debian-arb.patch
debian-cython-sys-path.patch
+debian-sage-env.patch
# temporary patches for whatever reason
# they will eventually be gotten rid of
--
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