[sagemath] 01/01: Fix paths patch: don't rewrite SAGE_ROOT after auto-detecting it in /usr/bin

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch master
in repository sagemath.

commit b8c5e354fbd2aa4c483723c9cd37f58d392edad8
Author: Ximin Luo <infinity0 at debian.org>
Date:   Tue Oct 18 05:11:30 2016 +0200

    Fix paths patch: don't rewrite SAGE_ROOT after auto-detecting it in /usr/bin
    
    Also bump Suggests: sagemath-doc-en to a Recommends, and move it to
    sagemath-common since /usr/share/jupyter/kernels/sagemath/doc links to it.
---
 debian/control.in                         |  2 +-
 debian/patches/debian-install-paths.patch | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/debian/control.in b/debian/control.in
index 28e1e53..ee5b580 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -197,7 +197,6 @@ Description: Sage: Open Source Mathematical Software
  This package contains the main Sage installation.
 Depends: ${misc:Depends}, ${shlibs:Depends}, ${python:Depends}, sagemath-common, sagemath-deps
 # TODO: missing a *lot* of python and other dependencies here
-Suggests: sagemath-doc-en
 
 Package: sagemath-common
 Architecture: all
@@ -213,6 +212,7 @@ Description: Sage: Open Source Mathematical Software
  .
  This package contains the architecture-independent files of Sage.
 Depends: ${misc:Depends}, ${shlibs:Depends}, ${python:Depends}
+Recommends: sagemath-doc-en
 
 Package: sagemath-deps
 Architecture: any
diff --git a/debian/patches/debian-install-paths.patch b/debian/patches/debian-install-paths.patch
index 1606a18..73d17c6 100644
--- a/debian/patches/debian-install-paths.patch
+++ b/debian/patches/debian-install-paths.patch
@@ -25,17 +25,18 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  	@echo "Deleting Sage library build artifacts..."
 --- a/sage/src/bin/sage-env
 +++ b/sage/src/bin/sage-env
-@@ -118,6 +118,9 @@
+@@ -118,6 +118,10 @@
      NEW_SAGE_ROOT="."
  elif [ -f ../../sage -a -d ../../build ]; then
      NEW_SAGE_ROOT="../.."
 +elif [ "$(which "$(basename "$0")")" = "$0" ]; then
 +    SAGE_LOCAL="${SAGE_LOCAL:-$(dirname $(dirname "$0"))}"
 +    SAGE_ROOT="$SAGE_LOCAL"
++    NEW_SAGE_ROOT="$SAGE_ROOT"
  else
      # No idea what SAGE_ROOT should be...
      echo >&2 "Error: You must set the SAGE_ROOT environment variable or run this"
-@@ -128,17 +131,6 @@
+@@ -128,17 +132,6 @@
  # Make NEW_SAGE_ROOT absolute
  NEW_SAGE_ROOT=`cd "$NEW_SAGE_ROOT" && pwd -P`
  
@@ -53,7 +54,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  # Warn if NEW_SAGE_ROOT does not equal the old SAGE_ROOT
  if [ "$SAGE_ROOT" != "$NEW_SAGE_ROOT" -a -n "$SAGE_ROOT" ]; then
      echo >&2 "Warning: overwriting SAGE_ROOT environment variable:"
-@@ -364,7 +356,7 @@
+@@ -364,7 +357,7 @@
      export SAGE_STARTUP_FILE
  fi
  
@@ -62,7 +63,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  if [ -n "$IPYTHONDIR" ]; then
      export IPYTHONDIR="$DOT_SAGE/${IPYTHONDIR##*/}"
  fi
-@@ -397,8 +389,10 @@
+@@ -397,8 +390,10 @@
      export PYTHONHOME
  fi
  
@@ -263,7 +264,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
              file = filename
 --- a/sage/src/sage_setup/docbuild/ext/multidocs.py
 +++ b/sage/src/sage_setup/docbuild/ext/multidocs.py
-@@ -277,7 +277,7 @@ def init_subdoc(app):
+@@ -277,7 +277,7 @@
              """
              app.builder.info(bold('linking _static directory.'))
              static_dir = os.path.join(app.builder.outdir, '_static')

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/sagemath.git