Merge branch 'develop' into u/tscrim/coxeter3_new_style_spkg-19178

Makefile

@@ -58,7 +58,7 @@ bootstrap-clean:
 maintainer-clean: distclean bootstrap-clean
 	rm -rf upstream
 
-micro_release: bdist-clean lib-clean
+micro_release: bdist-clean sagelib-clean
 	@echo "Stripping binaries ..."
 	LC_ALL=C find local/lib local/bin -type f -exec strip '{}' ';' 2>&1 | grep -v "File format not recognized" |  grep -v "File truncated" || true
 

VERSION.txt

@@ -1 +1 @@
-Sage version 6.9.beta5, released 2015-09-04
+Sage version 6.9.beta6, released 2015-09-10

build/bin/sage-spkg

@@ -60,7 +60,7 @@ export LC_ALL=C
 usage()
 {
 cat <<EOF
-Usage: sage -i <options> <package name>
+Usage: sage -p <options> <package name>
 
 If <package name> is a URL, download and install it. If it is a file
 name, install it. Otherwise, search Sage's list of packages (see
@@ -175,38 +175,30 @@ if [ $# -eq 0 ]; then
    exit 0
 fi
 
-# Options have to come in a specific order,
-# this is ensured by spkg/bin/sage.
+# Parse options
 INFO=0
-if [ "$1" = '--info' ]; then
-    INFO=1
-    shift
-fi
-
 FORCE=0
-if [ "$1" = '-f' ]; then
-    FORCE=1
+while true; do
+    case "$1" in
+        --info)
+            INFO=1;;
+        -f)
+            FORCE=1;;
+        -d)
+            SAGE_INSTALL_FETCH_ONLY=1;;
+        -s)
+            export SAGE_KEEP_BUILT_SPKGS=yes;;
+        -c|--check)
+            SAGE_CHECK_PACKAGES=x  # nonempty, so not set to '!python2' later
+            export SAGE_CHECK=yes;;
+        -*)
+            echo >&2 "Error: unknown option '$1'"
+            exit 2;;
+        *) break;;
+    esac
     shift
-fi
-
-DOWNLOAD_ONLY=0
-if [ "$1" = '-d' ]; then
-    DOWNLOAD_ONLY=1
-    shift
-elif [ -n "$SAGE_INSTALL_FETCH_ONLY" ]; then
-    DOWNLOAD_ONLY=1
-fi
+done
 
-if [ "$1" = '-s' ]; then
-    export SAGE_KEEP_BUILT_SPKGS=yes
-    shift
-fi
-
-if [ "$1" = '-c' ]; then
-    export SAGE_CHECK=yes
-    SAGE_CHECK_PACKAGES=x  # nonempty, so not set to '!python' later
-    shift
-fi
 
 ##################################################################
 # Figure out the package filename, download it if needed.
@@ -405,7 +397,7 @@ if [ -n "$SAGE_SPKG_COPY_UPSTREAM" ]; then
         exit 1
     fi
 fi
-if [ $DOWNLOAD_ONLY -ne 0 ]; then
+if [ -n "$SAGE_INSTALL_FETCH_ONLY" ]; then
     exit 0
 fi
 
@@ -557,7 +549,7 @@ fi
 # Since Python's self-tests seem to fail on all platforms, we disable
 # its test suite by default.
 if [ -z "$SAGE_CHECK_PACKAGES" ]; then
-    SAGE_CHECK_PACKAGES='!python'
+    SAGE_CHECK_PACKAGES='!python2'
 fi
 # Allow spaces, commas, or colons as separator (the documentation suggests commas).
 if echo ",$SAGE_CHECK_PACKAGES," | grep -i "[ ,:]\!$PKG_BASE[ ,:]" > /dev/null ; then

build/make/deps

@@ -11,7 +11,7 @@ STARTED = $(SAGE_LOCAL)/etc/sage-started.txt
 .PHONY: all all-sage all-toolchain all-build start \
 	base toolchain toolchain-deps sagelib \
 	doc doc-html doc-html-jsmath doc-html-mathjax doc-pdf \
-	doc-clean clean lib-clean build-clean
+	doc-clean clean sagelib-clean build-clean
 
 # Build everything and start Sage.
 # Note that we put the "doc" target first in the rule below because
@@ -227,7 +227,7 @@ clean:
 	@echo "Deleting package build directories..."
 	rm -rf "$(SAGE_LOCAL)/var/tmp/sage/build"
 
-lib-clean:
+sagelib-clean:
 	cd "$(SAGE_SRC)" && $(MAKE) clean
 
-build-clean: clean doc-clean lib-clean
+build-clean: clean doc-clean sagelib-clean

build/pkgs/brial/dependencies

@@ -1,4 +1,4 @@
-$(INST)/$(BOOST_CROPPED) $(INST)/$(M4RI) $(INST)/$(LIBPNG)
+$(INST)/$(BOOST_CROPPED) $(INST)/$(M4RI) $(INST)/$(LIBPNG) $(INST)/$(PKGCONF) $(INST)/$(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.

build/pkgs/configure/checksums.ini

@@ -1,4 +1,4 @@
 tarball=configure-VERSION.tar.gz
-sha1=205ca2be0f055ebac84723ccda60989a7a1c91a7
-md5=186c1817ecb28c891eaed8f936255846
-cksum=936437807
+sha1=eb85e3b0ebd4348d9ea95f6f756fc2691cb97969
+md5=33ea4bae501251c7794d76dc3b28eaaa
+cksum=2999590347

build/pkgs/configure/package-version.txt

@@ -1 +1 @@
-111
+112

build/pkgs/database_jones_numfield/SPKG.txt

@@ -0,0 +1,25 @@
+= database_jones_numfield =
+
+== Description ==
+
+This is a table of number fields with bounded ramification and degree ≤6.
+
+== License ==
+
+GPLv2+
+
+== SPKG Maintainers ==
+
+* Sagemath developers
+
+== Upstream Contact ==
+
+sage-devel@googlegroups.com
+
+== Dependencies ==
+
+None
+
+== Special Update/Build Instructions ==
+
+Created by taking the original old-style spkg and removing crud from it.

build/pkgs/database_jones_numfield/checksums.ini

@@ -0,0 +1,4 @@
+tarball=database_jones_numfield-VERSION.tar.gz
+sha1=f7b1c4c330ff6be47ade4ec7fc14df9cebe8e2a8
+md5=a8da4f207235a1de980a23a06e1e6d76
+cksum=1843797635

build/pkgs/database_jones_numfield/package-version.txt

@@ -0,0 +1 @@
+4

build/pkgs/database_jones_numfield/spkg-install

@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+
+if [ -z "$SAGE_SHARE" ]; then
+    echo >&2 "SAGE_SHARE undefined ... exiting"
+    echo >&2 "Maybe run 'sage --sh'?"
+    exit 1
+fi
+
+TARGET="${SAGE_SHARE}/jones"
+if [ ! -d "${TARGET}" ]; then
+   mkdir "${TARGET}"
+fi
+
+cp 'src/jones.sobj' "${TARGET}/"