[sagemath] 01/01: I think none of these are actually necessary (not yet tested because cypari breaks the build)

[Ximin Luo]

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

infinity0 pushed a commit to branch master
in repository sagemath.

commit f51d46c3841ee288fc61d33669a477e9b2e07dff
Author: Ximin Luo <infinity0 at debian.org>
Date:   Tue Jun 13 21:44:53 2017 +0200

    I think none of these are actually necessary (not yet tested because cypari breaks the build)
---
 debian/changelog               |  5 -----
 debian/control.in              |  1 -
 debian/control.runtime-depends |  3 ---
 debian/pruner/configure.ac     | 12 +++++++++---
 debian/pruner/pruner.py.in     |  2 +-
 5 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 990d0fc..03f227f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,6 @@
 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 8542ad2..8241d4e 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -60,7 +60,6 @@ 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 ef2fd66..fc57751 100644
--- a/debian/control.runtime-depends
+++ b/debian/control.runtime-depends
@@ -1,4 +1,3 @@
- curl,
  cysignals-tools (>= 1.2.0+ds-2) <!nodoc>,
  cython (>= 0.25),
  ecl (>= 16.1.2),
@@ -79,7 +78,6 @@
  python-psutil,
  python-ptyprocess,
  python-pygments,
- python-requests,
  python-rpy2,
  python-sagenb (>= 0.13),
  python-sagenb-export,
@@ -116,4 +114,3 @@
  sympow (>= 1.023-8),
  tachyon,
  xcas,
- yasm,
diff --git a/debian/pruner/configure.ac b/debian/pruner/configure.ac
index f557b92..6e55892 100644
--- a/debian/pruner/configure.ac
+++ b/debian/pruner/configure.ac
@@ -53,7 +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")
+# FIXME(curl): only needed by the spkg build system to download stuff, not needed in Debian
+#AC_CHECK_PROG(HAS_CURL, curl, "True", "False")
+HAS_CURL="True"
 AC_SUBST(HAS_CURL)
 
 AC_CHECK_PROG(HAS_CYTHON, cython, "True", "False")
@@ -251,7 +253,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")
+# FIXME(pcre): only used to build R, not needed in Debian
+#AC_CHECK_HEADER(pcre.h, HAS_PCRE="True", HAS_PCRE="False")
+HAS_PCRE="True"
 AC_SUBST(HAS_PCRE)
 
 AC_CHECK_PROG(HAS_PIP, pip, "True", "False")
@@ -344,7 +348,9 @@ AC_SUBST(HAS_WIDGETSNBEXTENSION)
 HAS_XZ="True"
 AC_SUBST(HAS_XZ)
 
-AC_CHECK_PROG(HAS_YASM, yasm, "True", "False")
+# FIXME(yasm): only used to build mpir, not needed in Debian
+#AC_CHECK_PROG(HAS_YASM, yasm, "True", "False")
+HAS_YASM="True"
 AC_SUBST(HAS_YASM)
 
 # FIXME(zeromq): useful only for pyzmq
diff --git a/debian/pruner/pruner.py.in b/debian/pruner/pruner.py.in
index 03dbd10..db94a54 100644
--- a/debian/pruner/pruner.py.in
+++ b/debian/pruner/pruner.py.in
@@ -191,7 +191,6 @@ python_modules = [
     'pygments',
     'pyparsing',
     'pytz',
-    'requests',
     'rpy2',
     'sagenb',
     'sagenb_export',
@@ -225,6 +224,7 @@ python_packages_to_modules = {
 }
 
 unneeded_packages = {
+    'requests', # FIXME(requests): only used to build sphinx, not needed in Debian
     'speaklater'
 }
 

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