Merge branch 'develop' into ticket/6018-DirichletGroup_zeta

Conflicts:
	src/sage/modular/dirichlet.py

Makefile

@@ -19,7 +19,7 @@ build: all-build
 
 # If configure was run before, rerun it with the old arguments.
 # Otherwise, run configure with argument $PREREQ_OPTIONS.
-build/make/Makefile: configure build/pkgs/*/*
+build/make/Makefile: configure build/make/deps build/pkgs/*/*
 	rm -f config.log
 	mkdir -p logs/pkgs
 	ln -s logs/pkgs/config.log config.log

README.txt

@@ -209,7 +209,7 @@ MORE DETAILED INSTRUCTIONS TO BUILD FROM SOURCE
 7. The HTML version of the documentation is built
    during the compilation process of Sage and resides in the directory:
 
-       $SAGE_ROOT/src/doc/output/html/
+       $SAGE_ROOT/local/share/doc/sage/html/
 
    OPTIONAL: If you want to build the PDF version (requires LaTeX) of
    the documentation, run:

VERSION.txt

@@ -1 +1 @@
-Sage version 7.0, released 2016-01-19
+Sage version 7.1.beta5, released 2016-02-25

build/make/deps

@@ -11,7 +11,8 @@ 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 sagelib-clean build-clean
+	doc-clean doc-src-clean doc-output-clean \
+	clean sagelib-clean build-clean
 
 # Build everything and start Sage.
 # Note that we put the "doc" target first in the rule below because
@@ -104,6 +105,7 @@ sagelib: \
 		$(INST)/$(BRIAL) \
 		$(INST)/$(CEPHES) \
 		$(INST)/$(CLIQUER) \
+		$(INST)/$(CYSIGNALS) \
 		$(INST)/$(CYTHON) \
 		$(INST)/$(ECL) \
 		$(INST)/$(ECLIB) \
@@ -211,9 +213,14 @@ doc-html-jsmath: doc-html-mathjax
 doc-pdf: $(DOC_DEPENDENCIES)
 	cd ../.. && sage-logger './sage --docbuild all pdf $(SAGE_DOCBUILD_OPTS)' logs/docpdf.log
 
-doc-clean:
+doc-clean: doc-src-clean doc-output-clean
+
+doc-src-clean:
 	cd "$(SAGE_SRC)/doc" && $(MAKE) clean
 
+doc-output-clean:
+	rm -rf "$(SAGE_SHARE)/doc/sage"
+
 
 ###############################################################################
 # Cleaning up

build/make/install

@@ -5,23 +5,22 @@
 ########################################################################
 
 # Assume current directory is SAGE_ROOT/build/make
-SAGE_ROOT=`cd ../.. && pwd -P`
-SAGE_SRC="$SAGE_ROOT/src"
-SAGE_LOCAL="$SAGE_ROOT/local"
-SAGE_SHARE="$SAGE_LOCAL/share"
-SAGE_EXTCODE="$SAGE_SHARE/sage/ext"
-SAGE_LOGS="$SAGE_ROOT/logs/pkgs"
-SAGE_SPKG_INST="$SAGE_LOCAL/var/lib/sage/installed"
-SAGE_VERSION=`cat $SAGE_ROOT/VERSION.txt | sed 's+.*\ \(.*\),.*+\1+'`
+export SAGE_ROOT=`cd ../.. && pwd -P`
+export SAGE_SRC="$SAGE_ROOT/src"
+export SAGE_LOCAL="$SAGE_ROOT/local"
+export SAGE_SHARE="$SAGE_LOCAL/share"
+export SAGE_EXTCODE="$SAGE_SHARE/sage/ext"
+export SAGE_LOGS="$SAGE_ROOT/logs/pkgs"
+export SAGE_SPKG_INST="$SAGE_LOCAL/var/lib/sage/installed"
+export SAGE_VERSION=`cat $SAGE_ROOT/VERSION.txt | sed 's+.*\ \(.*\),.*+\1+'`
 
 if [ -z "${SAGE_ORIG_PATH_SET}" ]; then
     SAGE_ORIG_PATH=$PATH && export SAGE_ORIG_PATH
     SAGE_ORIG_PATH_SET=True && export SAGE_ORIG_PATH_SET
 fi
-PATH="$SAGE_ROOT/build/bin:$SAGE_SRC/bin:$SAGE_LOCAL/bin:$PATH"
+export PATH="$SAGE_ROOT/build/bin:$SAGE_SRC/bin:$SAGE_LOCAL/bin:$PATH"
 
-PYTHONPATH="$SAGE_LOCAL"
-export SAGE_ROOT SAGE_SRC SAGE_LOCAL SAGE_EXTCODE SAGE_LOGS SAGE_SPKG_INST SAGE_VERSION PATH PYTHONPATH
+export PYTHONPATH="$SAGE_LOCAL"
 
 # Storing the start time of the build process. The time is stored in
 # seconds since 1970-01-01 in a hidden file called

build/pkgs/arb/checksums.ini

@@ -1,4 +1,4 @@
-tarball=arb-VERSION.tar.bz2
-sha1=fe1d6381d80498c40178c2a55fe93e0bface7c76
-md5=d97b2cbad8afc8ff05785840ed473ef3
-cksum=2593037017
+tarball=arb-VERSION.tar.gz
+sha1=fcca9134006e77cde5f2024f36150e823bf731ae
+md5=b6b94a39b71293b6811a191cb9542096
+cksum=248634837

build/pkgs/arb/package-version.txt

@@ -1 +1 @@
-2.7.0.p1
+2.8.1.p0