[sagemath] 01/02: Merge branch 'master' into experimental

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch experimental
in repository sagemath.

commit cee07577edd1aa784f096840a447e3b93630e592
Merge: 64087e7 c8a60da
Author: Tobias Hansen <thansen at debian.org>
Date:   Wed Jan 25 15:30:00 2017 +0000

    Merge branch 'master' into experimental

 debian/README.Debian                               | 13 ++--
 debian/README.source                               |  5 +-
 debian/adhoc/sage-env                              |  2 +-
 debian/changelog                                   | 12 ++++
 debian/patches/d0-disable-jsmol.patch              |  4 +-
 debian/patches/d1-disable-post-install-tests.patch | 35 ++++++++++
 debian/patches/d1-install-paths.patch              | 15 +++--
 debian/patches/d1-multiarch-python-paths.patch     | 31 +++++++++
 debian/patches/d1-sage-cli.patch                   | 23 ++++++-
 debian/patches/df-python_security.patch            |  2 +-
 debian/patches/series                              |  8 ++-
 debian/patches/u2-allow-override-sage-local.patch  |  8 +--
 .../patches/u2-fix-atrocious-symlink-logic.patch   | 32 +++++++++
 debian/patches/u2-fix-trivial-test-cases.patch     | 11 +++
 debian/patches/u2-looser-doctest-basename.patch    | 20 ++++++
 debian/rules                                       | 78 ++++++++--------------
 debian/sagemath.examples                           |  1 +
 debian/tests.mk                                    | 51 ++++++++++++++
 18 files changed, 273 insertions(+), 78 deletions(-)

diff --cc debian/changelog
index 8d5e8bf,a86cff1..c33f35a
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,33 -1,15 +1,45 @@@
 +sagemath (7.5.1-1) UNRELEASED; urgency=medium
 +
 +  * New upstream version.
 +  * Remove patches (applied upstream):
 +    - u0-version-cython-0.25.patch
 +    - u0-version-glpk-4.60.patch
 +    - u0-version-pari-2.9-trac-21765.patch
 +    - u0-version-singular-4.patch
 +    - u0-distutils-fixes.patch
 +    - u0-timeit-python-2.7.11.patch
 +    - u1-version-pkgconfig.patch
 +  * Patches with non-trivial modifications:
 +    - u0-pip-nowarn.patch
 +    - u0-version-pari-2.9.patch
 +    - u2-allow-override-sage-local.patch
 +    - u2-fix-trivial-test-cases.patch
 +    - u2-fix-less-trivial-test-cases.patch
 +    - d0-arb.patch (patch acb_poly.pxd)
 +    - d0-gsl-cblas.patch (keep gslcblas in gsl_libs)
 +    - d0-pari.patch
 +    - d0-paths-sharedata.patch
 +    - d0-paths.patch
 +    - d0-singular.patch
 +    - d1-install-paths.patch
 +    - d1-sage-env.patch (also patch env.py from here)
 +    - dt-disable-parallel-sphinx.patch
 +    - dt-more-fix-test-cases.patch (parts were applied upstream)
 +
 + -- Tobias Hansen <thansen at debian.org>  Wed, 18 Jan 2017 22:58:31 +0000
 +
+ sagemath (7.4-8) unstable; urgency=medium
+ 
+   * Work around some testing issues on i386. (Closes: #852374)
+ 
+  -- Ximin Luo <infinity0 at debian.org>  Wed, 25 Jan 2017 16:08:28 +0100
+ 
+ sagemath (7.4-7) unstable; urgency=medium
+ 
+   * Improve the state of post-install tests.
+ 
+  -- Ximin Luo <infinity0 at debian.org>  Sun, 22 Jan 2017 01:17:16 +0100
+ 
  sagemath (7.4-6) unstable; urgency=medium
  
    * Only check dochtml.log for errors if we will actually build the doc
diff --cc debian/patches/u2-allow-override-sage-local.patch
index d2ded99,a612c81..8321138
--- a/debian/patches/u2-allow-override-sage-local.patch
+++ b/debian/patches/u2-allow-override-sage-local.patch
@@@ -101,12 -101,23 +101,12 @@@ This patch header follows DEP-3: http:/
   
   #---------------------------------------------------------
   AX_CHECK_ROOT([AC_MSG_ERROR([You cannot build Sage as root, switch to an unpriviledged user])], [])
 ---- a/sage/src/setup.py
 -+++ b/sage/src/setup.py
 -@@ -625,7 +625,7 @@
 - python_packages, python_modules = find_python_sources(
 -     SAGE_SRC, ['sage', 'sage_setup'])
 - python_data_files = find_extra_files(python_packages,
 --    ".", SAGE_CYTHONIZED, SAGE_LIB, ["ntlwrap.cpp"])
 -+    ".", SAGE_CYTHONIZED, os.path.relpath(SAGE_LIB, SAGE_LOCAL), ["ntlwrap.cpp"])
 - 
 - log.info('python_packages = {0}'.format(python_packages))
 - log.info('python_modules = {0}'.format(python_modules))
  --- a/sage/src/sage/repl/ipython_kernel/install.py
  +++ b/sage/src/sage/repl/ipython_kernel/install.py
- @@ -94,7 +94,7 @@
-          except OSError as err:
-              if err.errno == errno.EEXIST:
-                  return
+ @@ -102,7 +102,7 @@
+                  pass
+              else:
+                  raise
  -        os.symlink(src, dst)
  +        os.symlink(os.path.relpath(src, os.path.dirname(dst)), dst)
   

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/sagemath.git