Update to latest upstream release

This commit is contained in:
pcpa 2019-11-08 08:46:01 -03:00
parent fa050d6863
commit 7b54d2115b
20 changed files with 285 additions and 834 deletions

View file

@ -1,6 +1,6 @@
diff -up src/sage/env.py.orig src/sage/env.py
--- src/sage/env.py.orig 2019-04-08 12:41:09.686920533 -0600
+++ src/sage/env.py 2019-04-08 12:42:41.240282849 -0600
--- src/sage/env.py.orig 2019-10-03 16:07:45.910528067 -0300
+++ src/sage/env.py 2019-10-03 16:08:40.659874228 -0300
@@ -159,9 +159,9 @@ var('SAGE_DOC', join(SAGE_SHA
var('SAGE_SPKG_INST', join(SAGE_LOCAL, 'var', 'lib', 'sage', 'installed'))
var('SAGE_LIB', os.path.dirname(os.path.dirname(sage.__file__)))
@ -8,7 +8,7 @@ diff -up src/sage/env.py.orig src/sage/env.py
-var('SAGE_ROOT') # no fallback for SAGE_ROOT
+var('SAGE_ROOT', '@@SAGE_ROOT@@')
var('SAGE_SRC', join(SAGE_ROOT, 'src'), SAGE_LIB)
-var('SAGE_DOC_SRC', join(SAGE_SRC, 'doc'))
-var('SAGE_DOC_SRC', join(SAGE_ROOT, 'src', 'doc'), SAGE_DOC)
+var('SAGE_DOC_SRC', '@@SAGE_DOC@@')
var('SAGE_PKGS', join(SAGE_ROOT, 'build', 'pkgs'))
var('SAGE_ROOT_GIT', join(SAGE_ROOT, '.git'))