[sagemath] 07/07: Add new standard packages to pruner and Depends: enum34, python3, threejs, xz.

[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 3b16f0bcd2d956ad7e86eba3e0dedd8ad37c7cdb
Author: Tobias Hansen <thansen at debian.org>
Date:   Sat Mar 18 13:33:03 2017 +0000

    Add new standard packages to pruner and Depends: enum34, python3, threejs, xz.
---
 debian/changelog               |  2 ++
 debian/control.runtime-depends |  2 ++
 debian/pruner/configure.ac     | 10 ++++++++++
 debian/pruner/pruner.py.in     |  4 ++++
 4 files changed, 18 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index a70be26..177aab5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ sagemath (7.6~rc1-2) UNRELEASED; urgency=medium
     - eclib (>= 20170122)
     - ecl (>= 16.1.3)
     - maxima-sage (>= 5.39.0)
+    - python3
+    - python-enum34
   * Remove patches (applied upstream):
     - u0-dont-test-glpk-version.patch
     - u0-fix-libgap-systemwide.patch
diff --git a/debian/control.runtime-depends b/debian/control.runtime-depends
index e3928aa..475c955 100644
--- a/debian/control.runtime-depends
+++ b/debian/control.runtime-depends
@@ -28,6 +28,7 @@
  pari-galdata,
  pari-seadata,
  python,
+ python3,
  python-alabaster,
  python-babel,
  python-backports-abc,
@@ -41,6 +42,7 @@
  python-cysignals-pari (>= 1.2.0+ds-2),
  python-decorator,
  python-docutils,
+ python-enum34,
  python-flask,
  python-flask-autoindex,
  python-flask-babel,
diff --git a/debian/pruner/configure.ac b/debian/pruner/configure.ac
index f441dc6..24ca469 100644
--- a/debian/pruner/configure.ac
+++ b/debian/pruner/configure.ac
@@ -285,6 +285,9 @@ AC_SUBST(HAS_PYNAC)
 PKG_CHECK_MODULES(python, python-2.7, [HAS_PYTHON='True'], [HAS_PYTHON='False'])
 AC_SUBST(HAS_PYTHON)
 
+PKG_CHECK_MODULES(python3, python-3.5, [HAS_PYTHON3='True'], [HAS_PYTHON3='False'])
+AC_SUBST(HAS_PYTHON3)
+
 AC_CHECK_PROG(HAS_R, R, "True", "False")
 AC_SUBST(HAS_R)
 
@@ -325,9 +328,16 @@ AC_SUBST(HAS_TACHYON)
 HAS_THEBE="True"
 AC_SUBST(HAS_THEBE)
 
+AC_CHECK_FILE(/usr/share/javascript/three/build/three.js, HAS_THREEJS="True", HAS_THREEJS="False")
+AC_SUBST(HAS_THREEJS)
+
 AC_CHECK_FILE(/usr/share/jupyter/nbextensions/jupyter-js-widgets/extension.js, HAS_WIDGETSNBEXTENSION="True", HAS_WIDGETSNBEXTENSION="False")
 AC_SUBST(HAS_WIDGETSNBEXTENSION)
 
+# xz is always installed
+HAS_XZ="True"
+AC_SUBST(HAS_XZ)
+
 # 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 35d8625..465c9f5 100644
--- a/debian/pruner/pruner.py.in
+++ b/debian/pruner/pruner.py.in
@@ -119,6 +119,7 @@ dico = {
     'ppl': @HAS_PPL@,
     'pynac': @HAS_PYNAC@,
     'python2': @HAS_PYTHON@,
+    'python3': @HAS_PYTHON3@,
     'r': @HAS_R@,
     'ratpoints': @HAS_RATPOINTS@,
     # those two go together afaik:
@@ -134,7 +135,9 @@ dico = {
     'sympow': @HAS_SYMPOW@,
     'tachyon': @HAS_TACHYON@,
     'thebe': @HAS_THEBE@,
+    'threejs': @HAS_THREEJS@,
     'widgetsnbextension': @HAS_WIDGETSNBEXTENSION@,
+    'xz': @HAS_XZ@,
     'zeromq': @HAS_ZEROMQ@,
     'zlib': @HAS_ZLIB@,
     'zn_poly': @HAS_ZNPOLY@
@@ -208,6 +211,7 @@ python_modules = [
 
 python_packages_to_modules = {
     'backports_shutil_get_terminal_size': 'backports/shutil_get_terminal_size',
+    'enum34': 'enum',
     'pathpy': 'path',
     'pillow': 'PIL',
     'pycrypto': 'Crypto',

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