Update to sagemath 6.1.1

This commit is contained in:
pcpa 2014-02-08 15:23:21 -02:00
parent d0a2caf3af
commit 34b5d7d380
30 changed files with 570 additions and 1598 deletions

View file

@ -1,21 +1,21 @@
diff -up sage-5.13/spkg/build/sage-5.13/sage/env.py.orig sage-5.13/spkg/build/sage-5.13/sage/env.py
--- sage-5.13/spkg/build/sage-5.13/sage/env.py.orig 2013-08-12 15:14:58.586048479 -0300
+++ sage-5.13/spkg/build/sage-5.13/sage/env.py 2013-08-12 15:15:55.102050643 -0300
diff -up src/sage/env.py.orig src/sage/env.py
--- src/sage/env.py.orig 2014-02-07 12:50:28.534870630 -0200
+++ src/sage/env.py 2014-02-07 12:51:07.014872104 -0200
@@ -85,7 +85,7 @@ _add_variable_or_fallback('HOSTNAME',
_add_variable_or_fallback('LOCAL_IDENTIFIER','$HOSTNAME.%s'%os.getpid())
# bunch of sage directories and files
-_add_variable_or_fallback('SAGE_ROOT', None)
+_add_variable_or_fallback('SAGE_ROOT', '@@SAGE_ROOT@@')
_add_variable_or_fallback('SAGE_LOCAL', opj('$SAGE_ROOT', 'local'))
_add_variable_or_fallback('SAGE_ETC', opj('$SAGE_LOCAL', 'etc'))
_add_variable_or_fallback('SAGE_SHARE', opj('$SAGE_LOCAL', 'share'))
@@ -95,7 +95,7 @@ _add_variable_or_fallback('SAGE_EXTCODE'
_add_variable_or_fallback('SAGE_PACKAGES', opj('$SAGE_ROOT', 'spkg'))
@@ -98,7 +98,7 @@ _add_variable_or_fallback('SAGE_LIB',
_add_variable_or_fallback('SAGE_EXTCODE', opj('$SAGE_SHARE', 'sage', 'ext'))
_add_variable_or_fallback('SAGE_LOGS', opj('$SAGE_ROOT', 'logs', 'pkgs'))
_add_variable_or_fallback('SAGE_SPKG_INST', opj('$SAGE_ROOT', 'spkg', 'installed'))
-_add_variable_or_fallback('SAGE_DOC', opj('$SAGE_ROOT', 'devel', 'sage', 'doc'))
_add_variable_or_fallback('SAGE_SPKG_INST', opj('$SAGE_LOCAL', 'var', 'lib', 'sage', 'installed'))
-_add_variable_or_fallback('SAGE_DOC', opj('$SAGE_SRC', 'doc'))
+_add_variable_or_fallback('SAGE_DOC', '@@SAGE_DOC@@')
_add_variable_or_fallback('DOT_SAGE', opj(os.environ.get('HOME','$SAGE_ROOT'), '.sage'))
# SAGE_LIB is the site-packages directory if the sage library
_add_variable_or_fallback('SAGE_DOT_GIT', opj('$SAGE_ROOT', '.git'))