[sagemath] 10/10: Add curl, pcre3, requests and yasm to pruner and (Build-)Depends.

[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 a7ba3c4f539cf7f217fa261b76a3eabb1138c7a6
Author: Tobias Hansen <thansen at debian.org>
Date:   Fri Jun 9 21:28:35 2017 +0000

    Add curl, pcre3, requests and yasm to pruner and (Build-)Depends.
---
 debian/changelog               | 5 +++++
 debian/control.in              | 1 +
 debian/control.runtime-depends | 3 +++
 debian/pruner/configure.ac     | 9 +++++++++
 debian/pruner/pruner.py.in     | 4 ++++
 5 files changed, 22 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 03f227f..990d0fc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,11 @@
 sagemath (8.0~beta9-1) UNRELEASED; urgency=medium
 
   * New upstream version.
+  * New (Build-)Depends:
+    - curl
+    - pcre3
+    - requests
+    - yasm
   * Remove patches (applied upstream):
     - u0-fix-proper-scipy-rtol.patch
     - u0-version-r-3.3.3.patch
diff --git a/debian/control.in b/debian/control.in
index 8241d4e..8542ad2 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -60,6 +60,7 @@ Build-Depends:
  libntl-dev (>= 9.9.1-2),
  libopenblas-dev (>= 0.2.19),
  libpari-dev (>= 2.9.0),
+ libpcre3-dev,
  libplanarity-dev,
  libpng-dev,
  libppl-dev (>= 1:1.1),
diff --git a/debian/control.runtime-depends b/debian/control.runtime-depends
index fc57751..ef2fd66 100644
--- a/debian/control.runtime-depends
+++ b/debian/control.runtime-depends
@@ -1,3 +1,4 @@
+ curl,
  cysignals-tools (>= 1.2.0+ds-2) <!nodoc>,
  cython (>= 0.25),
  ecl (>= 16.1.2),
@@ -78,6 +79,7 @@
  python-psutil,
  python-ptyprocess,
  python-pygments,
+ python-requests,
  python-rpy2,
  python-sagenb (>= 0.13),
  python-sagenb-export,
@@ -114,3 +116,4 @@
  sympow (>= 1.023-8),
  tachyon,
  xcas,
+ yasm,
diff --git a/debian/pruner/configure.ac b/debian/pruner/configure.ac
index 24ca469..f557b92 100644
--- a/debian/pruner/configure.ac
+++ b/debian/pruner/configure.ac
@@ -53,6 +53,9 @@ AC_SUBST(HAS_COMBINATORIAL_DESIGNS)
 AC_CHECK_FILE(/usr/share/sagemath/conway_polynomials/conway_polynomials.sobj, HAS_CONWAY_POLYNOMIALS="True", HAS_CONWAY_POLYNOMIALS="False")
 AC_SUBST(HAS_CONWAY_POLYNOMIALS)
 
+AC_CHECK_PROG(HAS_CURL, curl, "True", "False")
+AC_SUBST(HAS_CURL)
+
 AC_CHECK_PROG(HAS_CYTHON, cython, "True", "False")
 AC_SUBST(HAS_CYTHON)
 
@@ -248,6 +251,9 @@ AC_SUBST(HAS_PARI_SEADATA)
 AC_CHECK_PROG(HAS_PATCH, patch, "True", "False")
 AC_SUBST(HAS_PATCH)
 
+AC_CHECK_HEADER(pcre.h, HAS_PCRE="True", HAS_PCRE="False")
+AC_SUBST(HAS_PCRE)
+
 AC_CHECK_PROG(HAS_PIP, pip, "True", "False")
 AC_SUBST(HAS_PIP)
 
@@ -338,6 +344,9 @@ AC_SUBST(HAS_WIDGETSNBEXTENSION)
 HAS_XZ="True"
 AC_SUBST(HAS_XZ)
 
+AC_CHECK_PROG(HAS_YASM, yasm, "True", "False")
+AC_SUBST(HAS_YASM)
+
 # FIXME(zeromq): useful only for pyzmq
 HAS_ZEROMQ="True"
 AC_SUBST(HAS_ZEROMQ)
diff --git a/debian/pruner/pruner.py.in b/debian/pruner/pruner.py.in
index 465c9f5..03dbd10 100644
--- a/debian/pruner/pruner.py.in
+++ b/debian/pruner/pruner.py.in
@@ -60,6 +60,7 @@ dico = {
     'cliquer': @HAS_CLIQUER@,
     'combinatorial_designs': @HAS_COMBINATORIAL_DESIGNS@,
     'conway_polynomials': @HAS_CONWAY_POLYNOMIALS@,
+    'curl': @HAS_CURL@,
     'cython': @HAS_CYTHON@,
     'ecl': @HAS_ECL@,
     'eclib': @HAS_ECLIB@,
@@ -111,6 +112,7 @@ dico = {
     'pari_galdata': @HAS_PARI_GALDATA@,
     'pari_seadata_small': @HAS_PARI_SEADATA@,
     'patch': @HAS_PATCH@,
+    'pcre': @HAS_PCRE@,
     'pip': @HAS_PIP@,
     'pkgconf': @HAS_PKGCONF@,
     'pkgconfig': @HAS_PKGCONFIG@,
@@ -138,6 +140,7 @@ dico = {
     'threejs': @HAS_THREEJS@,
     'widgetsnbextension': @HAS_WIDGETSNBEXTENSION@,
     'xz': @HAS_XZ@,
+    'yasm': @HAS_YASM@,
     'zeromq': @HAS_ZEROMQ@,
     'zlib': @HAS_ZLIB@,
     'zn_poly': @HAS_ZNPOLY@
@@ -188,6 +191,7 @@ python_modules = [
     'pygments',
     'pyparsing',
     'pytz',
+    'requests',
     'rpy2',
     'sagenb',
     'sagenb_export',

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