[sagemath] 01/01: Split out a sagemath-jupyter package.

[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 c136c18e6c3213dce15681976e4decc54d5a8f5d
Author: Tobias Hansen <thansen at broeselmaschine.fc.up.pt>
Date:   Sun Dec 4 15:43:01 2016 +0000

    Split out a sagemath-jupyter package.
---
 debian/TODO                     |  1 -
 debian/control.in               | 27 +++++++++++++++++++++++----
 debian/control.jupyter-depends  |  8 ++++++++
 debian/control.runtime-depends  |  8 --------
 debian/rules                    |  1 +
 debian/sagemath-common.install  |  1 -
 debian/sagemath-jupyter.install |  1 +
 7 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/debian/TODO b/debian/TODO
index 68bfab0..35bd53a 100644
--- a/debian/TODO
+++ b/debian/TODO
@@ -14,7 +14,6 @@ Upload packages to NEW, ASAP
         * ignore known failing doctests
         * When running the tests with the installed sage, there are many failing tests with:
           ImportError: No module named common.conf
-        * create a separate package for the jupyter kernel
         * make installation of sagenb optional
         * We could create a package containing the (patched) sage sources to make
           it easier to run the testsuite.
diff --git a/debian/control.in b/debian/control.in
index ec2d6b7..6f98877 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -14,6 +14,7 @@ Vcs-Browser: https://anonscm.debian.org/cgit/debian-science/packages/sagemath.gi
 Vcs-Git: https://anonscm.debian.org/git/debian-science/packages/sagemath.git
 Build-Depends:
  RUNTIME_DEPENDS
+ JUPYTER_DEPENDS
  autoconf,
  ccache <pkg.sagemath.ccache>,
  debhelper (>= 10),
@@ -86,10 +87,11 @@ Description: Open Source Mathematical Software
  Mission: Creating a viable free open source alternative to Magma, Maple,
  Mathematica and Matlab.
  .
- This package contains the main Sage installation.
+ This package contains the main SageMath installation.
 Depends: ${misc:Depends}, ${shlibs:Depends}, ${python:Depends},
  RUNTIME_DEPENDS
- sagemath-common
+ sagemath-common (= ${binary:Version})
+Recommends: sagemath-doc-en, sagemath-jupyter
 
 Package: sagemath-common
 Architecture: all
@@ -104,6 +106,23 @@ Description: Open Source Mathematical Software - architecture-independent files
  Mission: Creating a viable free open source alternative to Magma, Maple,
  Mathematica and Matlab.
  .
- This package contains the architecture-independent files of Sage.
+ This package contains the architecture-independent files of SageMath.
 Depends: ${misc:Depends}, ${shlibs:Depends}, ${python:Depends}
-Recommends: sagemath-doc-en
+
+Package: sagemath-jupyter
+Architecture: all
+Multi-Arch: foreign
+Description: Open Source Mathematical Software - Jupyter kernel
+ SageMath is a free open-source mathematics software system licensed under the
+ GPL. It builds on top of many existing open-source packages: NumPy, SciPy,
+ matplotlib, Sympy, Maxima, GAP, FLINT, R and many more. Access their combined
+ power through a common, Python-based language or directly via interfaces or
+ wrappers.
+ .
+ Mission: Creating a viable free open source alternative to Magma, Maple,
+ Mathematica and Matlab.
+ .
+ This package contains the Jupyter kernel of SageMath.
+Depends:
+ JUPYTER_DEPENDS
+ sagemath (= ${binary:Version})
diff --git a/debian/control.jupyter-depends b/debian/control.jupyter-depends
new file mode 100644
index 0000000..05ea502
--- /dev/null
+++ b/debian/control.jupyter-depends
@@ -0,0 +1,8 @@
+ jupyter-client,
+ jupyter-core,
+ jupyter-nbextension-jupyter-js-widgets,
+ python-ipykernel,
+ python-ipywidgets,
+ python-nbconvert,
+ python-nbformat,
+ python-notebook,
diff --git a/debian/control.runtime-depends b/debian/control.runtime-depends
index 9adee8a..6cea3b7 100644
--- a/debian/control.runtime-depends
+++ b/debian/control.runtime-depends
@@ -11,9 +11,6 @@
  ipython (>= 5.1.0-2),
  iso-codes,
  jmol (>= 14.6.4),
- jupyter-client,
- jupyter-core,
- jupyter-nbextension-jupyter-js-widgets,
  lcalc (>= 1.23+dfsg-6+b1),
  libcdd-tools (>= 094h),
  libjs-mathjax,
@@ -56,19 +53,14 @@
  python-gd,
  python-gnutls,
  python-imagesize,
- python-ipykernel,
  python-ipython-genutils,
- python-ipywidgets,
  python-itsdangerous,
  python-jsonschema,
  python-matplotlib,
  python-mistune,
  python-moinmoin,
  python-mpmath,
- python-nbconvert,
- python-nbformat,
  python-networkx,
- python-notebook,
  python-numpy (>= 1:1.11.1~rc1),
  python-openid,
  python-path,
diff --git a/debian/rules b/debian/rules
index 7d7c727..86d23d4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -31,6 +31,7 @@ binary build clean install: debian/control
 debian/control: debian/control.in $(DOCS_CONTROL)
 	cat $^ > "$@"
 	sed -i -e '/RUNTIME_DEPENDS/ {' -e 'r debian/control.runtime-depends' -e 'd' -e '}' "$@"
+	sed -i -e '/JUPYTER_DEPENDS/ {' -e 'r debian/control.jupyter-depends' -e 'd' -e '}' "$@"
 
 debian/sagemath-doc-%.control: debian/sagemath-doc-LANG.control.in debian/rules
 	sed -e "s/LANGUAGE/$$(debian/lang.py $*)/g" -e 's/LANG/$*/g' < "$<" > "$@"
diff --git a/debian/sagemath-common.install b/debian/sagemath-common.install
index 81f75f8..fa29d6a 100644
--- a/debian/sagemath-common.install
+++ b/debian/sagemath-common.install
@@ -1,6 +1,5 @@
 usr/bin/sage
 debian/tmp/usr/bin/sage-* usr/share/sage/bin
 usr/share/sage/ext
-usr/share/jupyter/*
 usr/lib/python2.7/dist-packages/sage*
 sage/local/var/lib/sage/installed usr/share/sage
diff --git a/debian/sagemath-jupyter.install b/debian/sagemath-jupyter.install
new file mode 100644
index 0000000..70c3857
--- /dev/null
+++ b/debian/sagemath-jupyter.install
@@ -0,0 +1 @@
+usr/share/jupyter/*

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