[sagemath] 02/02: Use /usr/share/doc/sagemath instead of /usr/share/doc/sage as SAGE_DOC directory.

[Tobias Hansen]

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

thansen pushed a commit to branch _wip_sagemath_paths
in repository sagemath.

commit 34d9c1a1692fd16bf6c815396215dd95613a0648
Author: Tobias Hansen <thansen at debian.org>
Date:   Mon Dec 19 20:17:14 2016 +0000

    Use /usr/share/doc/sagemath instead of /usr/share/doc/sage as SAGE_DOC directory.
---
 debian/adhoc/sage-env                    | 2 +-
 debian/not-installed                     | 4 ++--
 debian/patches/d1-sage-env.patch         | 8 +++++++-
 debian/rules                             | 2 +-
 debian/sagemath-doc-LANG.doc-base.in     | 4 ++--
 debian/sagemath-doc-LANG.install.in      | 2 +-
 debian/sagemath-doc-en.lintian-overrides | 2 +-
 7 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/debian/adhoc/sage-env b/debian/adhoc/sage-env
index a057653..edc19ca 100644
--- a/debian/adhoc/sage-env
+++ b/debian/adhoc/sage-env
@@ -17,7 +17,7 @@ if [[ -z ${SAGE_SHARE} ]]; then
 fi
 
 if [[ -z ${SAGE_DOC} ]]; then
-	export SAGE_DOC="/usr/share/doc/sage"
+	export SAGE_DOC="/usr/share/doc/sagemath"
 fi
 
 if [[ -z ${SAGE_DOC_SRC} ]]; then
diff --git a/debian/not-installed b/debian/not-installed
index a657d1f..ed57a6a 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -1,2 +1,2 @@
-usr/share/doc/sage/doctrees
-usr/share/doc/sage/inventory
+usr/share/doc/sagemath/doctrees
+usr/share/doc/sagemath/inventory
diff --git a/debian/patches/d1-sage-env.patch b/debian/patches/d1-sage-env.patch
index 5d4215d..15d0a7e 100644
--- a/debian/patches/d1-sage-env.patch
+++ b/debian/patches/d1-sage-env.patch
@@ -7,7 +7,7 @@ Author: Tobias Hansen <thansen at debian.org>, Ximin Luo <infinity0 at debian.org>
 
 --- a/sage/src/bin/sage-env
 +++ b/sage/src/bin/sage-env
-@@ -264,7 +264,7 @@
+@@ -264,12 +264,12 @@
  # depending on SAGE_ROOT and SAGE_LOCAL which are already defined.
  export SAGE_ETC="$SAGE_LOCAL/etc"
  export SAGE_SHARE="$SAGE_LOCAL/share"
@@ -16,6 +16,12 @@ Author: Tobias Hansen <thansen at debian.org>, Ximin Luo <infinity0 at debian.org>
  export SAGE_SPKG_INST="$SAGE_ROOT/local/var/lib/sage/installed"
  export SAGE_LOGS="$SAGE_ROOT/logs/pkgs"
  export SAGE_SRC="$SAGE_ROOT/src"
+ export SAGE_DOC_SRC="$SAGE_SRC/doc"
+-export SAGE_DOC="$SAGE_SHARE/doc/sage"
++export SAGE_DOC="$SAGE_SHARE/doc/sagemath"
+ 
+ if [ -z "${SAGE_ORIG_PATH_SET}" ]; then 
+     SAGE_ORIG_PATH=$PATH && export SAGE_ORIG_PATH 
 @@ -325,12 +325,12 @@
  fi
  
diff --git a/debian/rules b/debian/rules
index f23178b..e895064 100755
--- a/debian/rules
+++ b/debian/rules
@@ -180,7 +180,7 @@ endif
 # its build directory. At least that's my (infinity0) impression; I didn't
 # investigate this in too much detail yet.
 clean-docbuild:
-	rm -rf debian/build/usr/share/doc/sage
+	rm -rf debian/build/usr/share/doc/sagemath
 
 distclean:
 	# don't git reset --hard on purpose, so it's easier to test
diff --git a/debian/sagemath-doc-LANG.doc-base.in b/debian/sagemath-doc-LANG.doc-base.in
index 3ce5682..0fe3142 100644
--- a/debian/sagemath-doc-LANG.doc-base.in
+++ b/debian/sagemath-doc-LANG.doc-base.in
@@ -5,5 +5,5 @@ Abstract: This is the manual for SageMath in LANGUAGE.
 Section: Science/Mathematics
 
 Format: HTML
-Index: /usr/share/doc/sage/html/LANG/SUBDIRindex.html
-Files: /usr/share/doc/sage/html/LANG/*
+Index: /usr/share/doc/sagemath/html/LANG/SUBDIRindex.html
+Files: /usr/share/doc/sagemath/html/LANG/*
diff --git a/debian/sagemath-doc-LANG.install.in b/debian/sagemath-doc-LANG.install.in
index 83c5887..942ac36 100644
--- a/debian/sagemath-doc-LANG.install.in
+++ b/debian/sagemath-doc-LANG.install.in
@@ -1 +1 @@
-usr/share/doc/sage/html/LANG
+usr/share/doc/sagemath/html/LANG
diff --git a/debian/sagemath-doc-en.lintian-overrides b/debian/sagemath-doc-en.lintian-overrides
index 6e92020..42d0667 100644
--- a/debian/sagemath-doc-en.lintian-overrides
+++ b/debian/sagemath-doc-en.lintian-overrides
@@ -1,2 +1,2 @@
 # False positive: This is not a license file, but the reference file for sage/misc/copying.py.
-sagemath-doc-en binary: extra-license-file usr/share/doc/sage/html/en/reference/misc/_sources/sage/misc/copying.txt
+sagemath-doc-en binary: extra-license-file usr/share/doc/sagemath/html/en/reference/misc/_sources/sage/misc/copying.txt

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