Merge branch 'develop' into t/18360/sr_matrix__fails_operations_minus_and_mul

* develop: (183 commits)
  Updated Sage version to 6.9.beta0
  Update to freetype 2.6
  trac 14243: set PYTHONNOUSERSITE=yes to avoid picking up user's Python files.
  Trac #11814: Fix failing Assertion nr_columns > 0 in setup_columns()
  Trac #16133: remove three further instances of FSMOldProcessOutput
  Trac #16133: Three docstrings: command instead of description
  Trac #16106: remove further occurrences of FSMOldCodeTransducerCartesianProduct
  Faster is_lattice().
  Updated Sage version to 6.8
  Trac #18947: Move -fix-pkg-checksums in making packages section of sage -advanced
  Trac #18901: Fix ReST syntax
  18950: Remove make_dlxwrapper from sage namespace
  Fix doctest in games/quantumino.py
  Better __repr__ for dancing links, added rows method
  Removed cimport Integer from dancing links
  Simplify dancing links code
  Trac #11814: Fix segmentation Fault raised by an assert
  "to to" -> "to".
  Trac #11814: Added not tested flag for segmentation fault
  just a few details in graph.py
  ...

Conflicts:
	src/sage/symbolic/expression.pyx

Author: rwst

VERSION.txt

@@ -1 +1 @@
-Sage version 6.8.rc0, released 2015-07-15
+Sage version 6.9.beta0, released 2015-07-29

build/pkgs/arb/dependencies

@@ -0,0 +1,5 @@
+$(INST)/$(SAGE_MP_LIBRARY) $(INST)/$(MPFR) $(INST)/$(FLINT)
+
+----------
+All lines of this file are ignored except the first.
+It is copied by SAGE_ROOT/build/make/install into SAGE_ROOT/build/make/Makefile.

build/pkgs/configure/checksums.ini

@@ -1,4 +1,4 @@
 tarball=configure-VERSION.tar.gz
-sha1=67067e5da0bb989d2ef1ea1ca35c0a948c797f73
-md5=54b621e9c239e12d563660f934591205
-cksum=3044690232
+sha1=74c12f15bd843d9bb723a17bac629846e4e8f57a
+md5=84df33fa9762cb8826ced5a7e6aadbc0
+cksum=4042526937

build/pkgs/configure/package-version.txt

@@ -1 +1 @@
-103
+106

build/pkgs/freetype/checksums.ini

@@ -1,4 +1,4 @@
 tarball=freetype-VERSION.tar.bz2
-sha1=72731cf405b9f7c0b56d144130a8daafa262b729
-md5=10e8f4d6a019b124088d18bc26123a25
-cksum=1007257349
+sha1=cd2b144205dd2c61693e2d861069367aa3dde1bc
+md5=5682890cb0267f6671dd3de6eabd3e69
+cksum=4209260006

build/pkgs/freetype/package-version.txt

@@ -1 +1 @@
-2.5.2.p1
+2.6

build/pkgs/openssl/checksums.ini

@@ -1,4 +1,4 @@
 tarball=openssl-VERSION.tar.gz
-sha1=6e4a5e91159eb32383296c7c83ac0e59b83a0a44
-md5=8c8d81a9ae7005276e486702edbcd4b6
-cksum=1938030126
+sha1=d01d17b44663e8ffa6a33a5a30053779d9593c3d
+md5=38dd619b2e77cbac69b99f52a053d25a
+cksum=4293826663

build/pkgs/openssl/package-version.txt

@@ -1 +1 @@
-1.0.2c
+1.0.2d

src/bin/math-readline

@@ -5,21 +5,27 @@
 # See
 #    http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/363500
 
-import os, sys
-import six
-f1 = os.popen('math ', 'w')
-f1.flush()
-try:
-    while True:
-        sys.stdout.write('')
-        try:
-            line = six.moves.input()
-            f1.writelines(line+'\n')
-            f1.flush()
-        except KeyboardInterrupt:
-            f1.close()
-            break
-except EOFError:
-    pass
+import sys, signal, subprocess
+import readline
+from six.moves import input
+
+def child_exited(*args):
+    global child
+    status = child.poll()
+    if status is not None:
+        sys.exit(status)
+
+signal.signal(signal.SIGCHLD, child_exited)
+
+child = subprocess.Popen('math', shell=True, stdin=subprocess.PIPE)
+pipe = child.stdin
+while True:
+    try:
+        line = input()
+        pipe.write(line + '\n')
+        pipe.flush()
+    except KeyboardInterrupt:
+        pipe.close()
+    except EOFError:
+        break
 sys.stdout.write('\n')
-sys.exit()

src/bin/sage

@@ -206,9 +206,11 @@ usage_advanced() {
     ####  |.....................--.|...................................................|
     echo "Making Sage packages or distributions:"
     echo "  -bdist <tmpdir>     -- build a binary distribution of Sage"
+    echo "  -sdist              -- build a source distribution of Sage"
     echo "  -pkg <dir>          -- create Sage package dir.spkg from a given directory"
     echo "  -pkg_nc <dir>       -- as -pkg, but do not compress the package"
-    echo "  -sdist              -- build a source distribution of Sage"
+    echo "  -fix-pkg-checksums  -- fix the checksums from build/pkgs directories from "
+    echo "                         the packages located in upstream/"
 
     echo
     ####  1.......................26..................................................78
@@ -459,6 +461,11 @@ if [ "$1" = '-pip' -o "$1" = '--pip' ]; then
     exec pip "$@"
 fi
 
+if [ "$1" = '-fix-pkg-checksums' -o "$1" = '--fix-pkg-checksums' ]; then
+    shift
+    exec sage-fix-pkg-checksums "$@"
+fi
+
 if [ "$1" = '-python' -o "$1" = '--python' ]; then
     shift
     exec python "$@"