[sagemath] 05/06: Install SAGE_SPKG_INST folder and set this variable accordingly.

[Tobias Hansen]

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

thansen pushed a commit to branch master
in repository sagemath.

commit 719ba035ea8ea94075a132952a3264b804824b16
Author: Tobias Hansen <thansen at broeselmaschine.fc.up.pt>
Date:   Fri Dec 2 20:50:31 2016 +0000

    Install SAGE_SPKG_INST folder and set this variable accordingly.
---
 debian/patches/debian-install-paths.patch | 11 ++++++++---
 debian/rules                              |  1 +
 debian/sagemath-common.install            |  1 +
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/debian/patches/debian-install-paths.patch b/debian/patches/debian-install-paths.patch
index 87190a8..76fae84 100644
--- a/debian/patches/debian-install-paths.patch
+++ b/debian/patches/debian-install-paths.patch
@@ -47,9 +47,14 @@ 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:"
-@@ -267,7 +256,9 @@
+@@ -265,9 +254,13 @@
+ export SAGE_ETC="$SAGE_LOCAL/etc"
+ export SAGE_SHARE="$SAGE_LOCAL/share"
  export SAGE_EXTCODE="$SAGE_SHARE/sage/ext"
- export SAGE_SPKG_INST="$SAGE_ROOT/local/var/lib/sage/installed"
+-export SAGE_SPKG_INST="$SAGE_ROOT/local/var/lib/sage/installed"
++if [ -z "$SAGE_SPKG_INST" ]; then
++    export SAGE_SPKG_INST="/usr/share/sage/installed"
++fi
  export SAGE_LOGS="$SAGE_ROOT/logs/pkgs"
 -export SAGE_SRC="$SAGE_ROOT/src"
 +if [ -z "$SAGE_SRC" ]; then
@@ -58,7 +63,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  export SAGE_DOC_SRC="$SAGE_SRC/doc"
  export SAGE_DOC="$SAGE_SHARE/doc/sage"
  
-@@ -420,8 +411,10 @@
+@@ -420,8 +413,10 @@
      export PYTHONHOME
  fi
  
diff --git a/debian/rules b/debian/rules
index a39c784..a8e92a6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,6 +14,7 @@ $(shell mkdir -p "$(CCACHE_DIR)")
 endif
 
 export SAGE_ROOT = $(shell pwd)/sage
+export SAGE_SPKG_INST = $(shell pwd)/sage/local/var/lib/sage/installed
 export SAGE_LOCAL = $(shell pwd)/debian/build/usr
 export PYTHONPATH = $(shell pwd)/debian/build/usr/lib/python2.7/dist-packages
 
diff --git a/debian/sagemath-common.install b/debian/sagemath-common.install
index cc0582d..cacc8ab 100644
--- a/debian/sagemath-common.install
+++ b/debian/sagemath-common.install
@@ -35,3 +35,4 @@ usr/share/sage/ext
 usr/share/jupyter/*
 usr/lib/python2.7/dist-packages/sage/*
 usr/lib/python2.7/dist-packages/sage*.egg-info
+sage/local/var/lib/sage/installed usr/share/sage

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