[sagemath] 03/06: Don't check if in sage source directory.

[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 4973188de622fe5ab860b40c2903606d82e57732
Author: Tobias Hansen <thansen at broeselmaschine.fc.up.pt>
Date:   Fri Dec 2 19:38:03 2016 +0000

    Don't check if in sage source directory.
---
 debian/patches/debian-skip-check.patch             | 26 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 .../version-temp-singular-4-extra-fixes.patch      |  2 +-
 3 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/debian/patches/debian-skip-check.patch b/debian/patches/debian-skip-check.patch
new file mode 100644
index 0000000..56361b8
--- /dev/null
+++ b/debian/patches/debian-skip-check.patch
@@ -0,0 +1,26 @@
+Description: Do not check if we are in a sage source directory
+ This is useful for example to run the test suite with the installed sage.
+Author: Tobias Hansen <thansen at debian.org>
+Forwarded: not-needed
+
+--- a/sage/src/bin/sage
++++ b/sage/src/bin/sage
+@@ -355,18 +355,6 @@
+ 
+ # Prepare for running Sage, either interactively or non-interactively.
+ sage_setup() {
+-    # Check that we're not in a source tarball which hasn't been built yet (#13561).
+-    if [ ! -d "$SAGE_LOCAL/lib/python2.7/dist-packages/sage" ]; then
+-        echo >&2 '************************************************************************'
+-        echo >&2 'It seems that you are attempting to run Sage from an unpacked source'
+-        echo >&2 'tarball, but you have not compiled it yet (or maybe the build has not'
+-        echo >&2 'finished). You should run `make` in the Sage root directory first.'
+-        echo >&2 'If you did not intend to build Sage from source, you should download'
+-        echo >&2 'a binary tarball instead. Read README.txt for more information.'
+-        echo >&2 '************************************************************************'
+-        exit 1
+-    fi
+-
+     # Display the startup banner (unless SAGE_BANNER is explictly "no")
+     sage_banner
+ 
diff --git a/debian/patches/series b/debian/patches/series
index b193ff7..2a7ebad 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -50,6 +50,7 @@ debian-install-paths.patch
 
 # temporary patches for whatever reason
 # they will eventually be gotten rid of
+debian-skip-check.patch
 temp-disable-parallel-sphinx.patch
 temp-cython-include-source.patch
 version-temp-singular-4-extra-fixes.patch
diff --git a/debian/patches/version-temp-singular-4-extra-fixes.patch b/debian/patches/version-temp-singular-4-extra-fixes.patch
index 499417b..4002a44 100644
--- a/debian/patches/version-temp-singular-4-extra-fixes.patch
+++ b/debian/patches/version-temp-singular-4-extra-fixes.patch
@@ -8,7 +8,7 @@ Forwarded: TODO, to Sage
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/sage/src/bin/sage
 +++ b/sage/src/bin/sage
-@@ -472,7 +472,7 @@
+@@ -460,7 +460,7 @@
  
  if [ "$1" = '-singular' -o "$1" = '--singular' ]; then
      shift

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