Merge branch 'develop' into public/monoids/15289-indexed

* develop: (95 commits)
  Trac #14858: more robust type checks for arith.py
  Updated Sage version to 6.1.beta3
  Trac #11271: making the curve inaccessible + documentation
  Trac #11271: Corrections to is_surjective in Galois representations over Q.
  sage-sdist: copy upstream tarballs using sage-spkg
  Fixed docbuild.
  Removed removed file from doc.
  Fix wrong NOTE block.
  Where possible, remove optional - database_stein_watkins
  Stein-Watkins database: reviewer patch
  buid/deps : added a dependency of freetype on libpng in order to work around a build-time race condition.
  Replace bytes_to_long/long_to_bytes by ord/chr.
  Revert "Filter pycrypto warning about insecure modular exponentiaiton."
  first version of the git-trac package
  Filter pycrypto warning about insecure modular exponentiaiton.
  Update PyCrypto to version 2.6.1.
  Let PyCrypto build on FreeBSD.
  trac #15435: WeylGroup and CoxeterGroup to groups.<tab>
  trac #15369: Alias groups.misc.AdditiveCyclic to IntegerModRing
  Fix for comparison of padics.
  ...

Author: Travis Scrimshaw

VERSION.txt

@@ -1 +1 @@
-Sage version 6.1.beta2, released 2013-12-23
+Sage version 6.1.beta3, released 2014-01-04

build/deps

@@ -80,7 +80,7 @@ all-sage: \
      $(INST)/$(PALP) \
      $(INST)/$(PARI) \
      $(INST)/$(PEXPECT) \
-     $(INST)/$(PIL) \
+     $(INST)/$(PILLOW) \
      $(INST)/$(POLYBORI) \
      $(INST)/$(POLYTOPES_DB) \
      $(INST)/$(PPL) \
@@ -311,7 +311,7 @@ $(INST)/$(SQLITE): $(INST)/$(READLINE)
 # SageTeX, you actually need to run Sage, produce plots,...
 $(INST)/$(SAGETEX): $(INST)/$(PYTHON) \
                     $(SAGERUNTIME) $(INST)/$(MAXIMA) $(INST)/$(SCIPY) \
-                    $(INST)/$(MATPLOTLIB) $(INST)/$(PIL) $(INST)/$(TACHYON)
+                    $(INST)/$(MATPLOTLIB) $(INST)/$(PILLOW) $(INST)/$(TACHYON)
 	+$(PIPE) "$(SAGE_SPKG) $(SAGETEX) 2>&1" "tee -a $(SAGE_LOGS)/$(SAGETEX).log"
 
 $(INST)/$(SETUPTOOLS): $(INST)/$(PYTHON)
@@ -336,7 +336,7 @@ $(INST)/$(ZLIB):
 $(INST)/$(JMOL): $(INST)/$(SAGENB)
 	+$(PIPE) "$(SAGE_SPKG) $(JMOL) 2>&1" "tee -a $(SAGE_LOGS)/$(JMOL).log"
 
-$(INST)/$(FREETYPE):
+$(INST)/$(FREETYPE): $(INST)/$(LIBPNG)
 	+$(PIPE) "$(SAGE_SPKG) $(FREETYPE) 2>&1" "tee -a $(SAGE_LOGS)/$(FREETYPE).log"
 
 $(INST)/$(LIBPNG): $(INST)/$(ZLIB)
@@ -484,8 +484,8 @@ $(INST)/$(GCC): $(INST)/$(MPIR) $(INST)/$(MPFR) $(INST)/$(MPC) \
                 $(INST)/$(ZLIB)
 	+$(PIPE) "$(SAGE_SPKG) $(GCC) 2>&1" "tee -a $(SAGE_LOGS)/$(GCC).log"
 
-$(INST)/$(PIL): $(INST)/$(PYTHON)
-	+$(PIPE) "$(SAGE_SPKG) $(PIL) 2>&1" "tee -a $(SAGE_LOGS)/$(PIL).log"
+$(INST)/$(PILLOW): $(INST)/$(PYTHON) $(INST)/$(SETUPTOOLS)
+	+$(PIPE) "$(SAGE_SPKG) $(PILLOW) 2>&1" "tee -a $(SAGE_LOGS)/$(PILLOW).log"
 
 $(INST)/$(NUMPY): $(INST)/$(PYTHON) $(INST)/$(ATLAS)
 	+$(PIPE) "$(SAGE_SPKG) $(NUMPY) 2>&1" "tee -a $(SAGE_LOGS)/$(NUMPY).log"
@@ -507,6 +507,7 @@ $(INST)/$(CEPHES):
 # setuptools forgets to update easy-install.pth during parallel
 # builds, so we build the relevant packages serially.
 
+$(INST)/$(SQLALCHEMY): $(INST)/$(PILLOW)
 $(INST)/$(PYGMENTS): $(INST)/$(SQLALCHEMY)
 $(INST)/$(JINJA2): $(INST)/$(PYGMENTS)
 $(INST)/$(SPHINX): $(INST)/$(JINJA2)