Version 9.1.

- Drop upstreamed -nauty patch.
- Drop -cbc patch; upstream uses the system Cbc now.
- Add -ecl patch for ecl 20.4.24.
This commit is contained in:
Jerry James 2020-07-10 11:04:09 -06:00
parent 4556e3ebb0
commit eb706cd5f8
15 changed files with 838 additions and 732 deletions

View file

@ -1,6 +1,7 @@
--- src/sage/env.py.orig 2020-03-13 09:03:58.705213254 -0600
+++ src/sage/env.py 2020-03-13 09:06:42.148502755 -0600
@@ -151,11 +151,11 @@ var('SAGE_DATE', version.date)
diff -up src/sage/env.py.orig src/sage/env.py
--- src/sage/env.py.orig 2020-07-06 16:59:20.179973650 -0600
+++ src/sage/env.py 2020-07-06 17:03:47.991916151 -0600
@@ -158,14 +158,14 @@ var('SAGE_DATE', version.date)
var('SAGE_VERSION_BANNER', version.banner)
# bunch of sage directories and files
@ -16,17 +17,12 @@
+var('SAGE_DOC', join('/usr', 'share', 'doc', 'sagemath'))
var('SAGE_SPKG_INST', join(SAGE_LOCAL, 'var', 'lib', 'sage', 'installed'))
var('SAGE_LIB', os.path.dirname(os.path.dirname(sage.__file__)))
-var('SAGE_EXTCODE', join(SAGE_LIB, 'sage', 'ext_data'))
+var('SAGE_EXTCODE', join('/usr', 'share', 'sagemath', 'etc'))
@@ -169,7 +169,7 @@ var('DOT_SAGE', join(os.envir
var('SAGE_STARTUP_FILE', join(DOT_SAGE, 'init.sage'))
# installation directories for various packages
-var('SAGE_EXTCODE', join(SAGE_SHARE, 'sage', 'ext'))
+var('SAGE_EXTCODE', join('/usr', 'share', 'sagemath', 'etc'))
var('CONWAY_POLYNOMIALS_DATA_DIR', join(SAGE_SHARE, 'conway_polynomials'))
var('GRAPHS_DATA_DIR', join(SAGE_SHARE, 'graphs'))
var('ELLCURVE_DATA_DIR', join(SAGE_SHARE, 'ellcurves'))
@@ -179,13 +179,13 @@ var('THEBE_DIR', joi
var('SAGE_ROOT', '@@SAGE_ROOT@@')
var('SAGE_SRC', join(SAGE_ROOT, 'src'), SAGE_LIB)
@@ -186,13 +186,13 @@ var('THEBE_DIR', joi
var('COMBINATORIAL_DESIGN_DATA_DIR', join(SAGE_SHARE, 'combinatorial_designs'))
var('CREMONA_MINI_DATA_DIR', join(SAGE_SHARE, 'cremona'))
var('CREMONA_LARGE_DATA_DIR', join(SAGE_SHARE, 'cremona'))
@ -42,6 +38,6 @@
var('SINGULARPATH', join(SAGE_SHARE, 'singular'))
-var('PPLPY_DOCS', join(SAGE_SHARE, 'doc', 'pplpy'))
+var('PPLPY_DOCS', join('/usr', 'share', 'doc', 'python3-pplpy'))
var('MAXIMA', 'maxima')
var('MAXIMA_FAS')
# misc
var('SAGE_NAUTY_BINS_PREFIX', '')