[sagemath] 01/01: 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 e785f2883e61bc9527e4865f69dbfb986c1718de
Merge: 70ba055 7e54c88
Author: Tobias Hansen <thansen at debian.org>
Date:   Thu Jan 26 00:29:58 2017 +0000

    Merge branch 'master' into experimental

 debian/changelog  | 6 ++++++
 debian/control.in | 2 +-
 debian/rules      | 3 ---
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --cc debian/changelog
index c33f35a,e5e48f6..e18d2ee
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,32 -1,8 +1,38 @@@
 +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-9) unstable; urgency=medium
+ 
+   * Update for dh-python 2.20170125.
+ 
+  -- Ximin Luo <infinity0 at debian.org>  Thu, 26 Jan 2017 01:16:15 +0100
  
  sagemath (7.4-8) unstable; urgency=medium
  

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