[sagemath] 01/05: Revert "Drop dependency on atlas."

[Tobias Hansen]

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

thansen pushed a commit to branch master
in repository sagemath.

commit 3298ec727ce5c52d6dcb86e063c61a273657a1c8
Author: Tobias Hansen <thansen at debian.org>
Date:   Sun Sep 10 11:29:27 2017 +0100

    Revert "Drop dependency on atlas."
    
    This reverts commit d7bf24ea50b89d9bece6e02243b1e8a7f1a988b8.
---
 debian/changelog           | 6 ++----
 debian/control.in          | 1 +
 debian/pruner/configure.ac | 3 +++
 debian/pruner/pruner.py.in | 1 +
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1fa7b04..b35ec4c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,9 @@
-sagemath (8.0-7) UNRELEASED; urgency=medium
+sagemath (8.0-6) UNRELEASED; urgency=medium
 
   * Use pkg-config to check for openblas in pruner, the old check
     broke with the multiarchified openblas 0.2.20+ds-3.
-  * Drop dependency on atlas (libatlas-base-dev), it is now an
-    optional sagemath package.
 
- -- Tobias Hansen <thansen at debian.org>  Sun, 10 Sep 2017 09:19:38 +0000
+ -- Tobias Hansen <thansen at debian.org>  Sun, 10 Sep 2017 09:16:50 +0000
 
 sagemath (8.0-5) unstable; urgency=medium
 
diff --git a/debian/control.in b/debian/control.in
index 0006e50..59f3e53 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -24,6 +24,7 @@ Build-Depends:
  git,
  gnutls-dev,
  libgap-sage-dev (>= 4.8.6),
+ libatlas-base-dev,
  libblas-dev,
  libboost-dev (>= 1.55),
  libbrial-dev (>= 0.8.7),
diff --git a/debian/pruner/configure.ac b/debian/pruner/configure.ac
index 3336875..ed09889 100644
--- a/debian/pruner/configure.ac
+++ b/debian/pruner/configure.ac
@@ -16,6 +16,9 @@ PKG_PROG_PKG_CONFIG
 HAS_APPNOPE="True"
 AC_SUBST(HAS_APPNOPE)
 
+AC_CHECK_HEADER(atlas/clapack.h, HAS_ATLAS="True", HAS_ATLAS="False")
+AC_SUBST(HAS_ATLAS)
+
 # FIXME(backports_ssl_match_hostname): only needed for tornado, hence not needed
 HAS_BACKPORTS_SSL_MATCH_HOSTNAME="True"
 AC_SUBST(HAS_BACKPORTS_SSL_MATCH_HOSTNAME)
diff --git a/debian/pruner/pruner.py.in b/debian/pruner/pruner.py.in
index 2a9de6e..6c51ceb 100644
--- a/debian/pruner/pruner.py.in
+++ b/debian/pruner/pruner.py.in
@@ -49,6 +49,7 @@ sage_standard_packages = set(subprocess.check_output([
 dico = {
     'appnope': @HAS_APPNOPE@,
     'arb': @HAS_ARB@,
+    'atlas': @HAS_ATLAS@,
     'backports_ssl_match_hostname': @HAS_BACKPORTS_SSL_MATCH_HOSTNAME@,
     'boost_cropped': @HAS_BOOST@,
     'brial': @HAS_POLYBORI@,

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