[Python-modules-commits] [jupyter-notebook] 05/09: Build python2 library and add jupyter-notebook binary package

[Gordon Ball]

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

chronitis-guest pushed a commit to branch master
in repository jupyter-notebook.

commit 662cad44b016a723890f2458d614676d389fb595
Author: Gordon Ball <gordon at chronitis.net>
Date:   Fri Oct 28 12:24:22 2016 +0200

    Build python2 library and add jupyter-notebook binary package
---
 debian/control                                     | 69 +++++++++++++++++++++-
 debian/jupyter-notebook.install                    |  1 +
 ...notebook.manpages => jupyter-notebook.manpages} |  0
 ...-notebook-doc.docs => python-notebook-doc.docs} |  0
 debian/python-notebook.install                     |  1 +
 debian/python3-notebook.install                    |  1 +
 debian/rules                                       |  4 +-
 7 files changed, 70 insertions(+), 6 deletions(-)

diff --git a/debian/control b/debian/control
index 175ac5e..ce39009 100644
--- a/debian/control
+++ b/debian/control
@@ -23,6 +23,20 @@ Build-Depends: debhelper (>= 10),
                python3-terminado <!nocheck>,
                python3-entrypoints <!nocheck>,
                python3-zmq <!nocheck>,
+               python-all,
+               python-setuptools,
+               python-nose <!nocheck>,
+               python-requests <!nocheck>,
+               python-ipython (>= 4) <!nocheck>,
+               python-jupyter-core <!nocheck>,
+               python-jupyter-client <!nocheck>,
+               python-tornado <!nocheck>,
+               python-nbformat <!nocheck>,
+               python-nbconvert <!nocheck>,
+               python-ipykernel <!nocheck>,
+               python-terminado <!nocheck>,
+               python-entrypoints <!nocheck>,
+               python-zmq <!nocheck>,
                python3-sphinx <!nodoc>,
                python3-sphinx-rtd-theme <!nodoc>,
                libjs-backbone (>= 1.2),
@@ -47,8 +61,43 @@ Build-Depends: debhelper (>= 10),
                node-requirejs,
                node-uglify,
                cleancss
+X-Python-Version: >= 2.7
 X-Python3-Version: >= 3.3
 
+Package: python-notebook
+Architecture: all
+Depends: ${misc:Depends},
+         ${python:Depends},
+         libjs-backbone (>= 1.2),
+         libjs-bootstrap (>= 3.3),
+         libjs-bootstrap-tour (>= 0.9),
+         libjs-codemirror,
+         libjs-es6-promise (>= 1.0),
+         fonts-font-awesome (>= 4.2),
+         libjs-jquery,
+         libjs-jquery-ui (>= 1.10),
+         libjs-marked (>= 0.3),
+         libjs-mathjax (>= 2.5),
+         libjs-moment (>= 2.8.4),
+         libjs-requirejs (>= 2.1),
+         libjs-term.js,
+         libjs-text-encoding (>= 0.1),
+         libjs-underscore (>= 1.5),
+         libjs-jquery-typeahead (>= 2.0),
+Recommends: python-ipywidgets,
+            python-ipykernel
+Suggests: python-notebook-doc
+Description: Jupyter interactive notebook (Python 2)
+ The Jupyter Notebook is a web application that allows you to create and
+ share documents that contain live code, equations, visualizations, and
+ explanatory text. The Notebook has support for multiple programming
+ languages, sharing, and interactive widgets.
+ .
+ This package contains the Python 2 library.
+ .
+ This package is not required to run Python 2 code in the notebook, only to
+ allow Python 2 code to interact directly with the notebook server.
+
 Package: python3-notebook
 Architecture: all
 Depends: ${misc:Depends},
@@ -71,14 +120,16 @@ Depends: ${misc:Depends},
          libjs-jquery-typeahead (>= 2.0),
 Recommends: python3-ipywidgets,
             python3-ipykernel
-Suggests: python3-notebook-doc
-Description: Jupyter interactive notebook
+Suggests: python-notebook-doc
+Description: Jupyter interactive notebook (Python 3)
  The Jupyter Notebook is a web application that allows you to create and
  share documents that contain live code, equations, visualizations, and
  explanatory text. The Notebook has support for multiple programming
  languages, sharing, and interactive widgets.
+ .
+ This package contains the Python 3 library.
 
-Package: python3-notebook-doc
+Package: python-notebook-doc
 Build-Profiles: <!nodoc>
 Architecture: all
 Section: doc
@@ -92,3 +143,15 @@ Description: Jupyter interactive notebook (documentation)
  languages, sharing, and interactive widgets.
  .
  This package contains the documentation.
+
+Package: jupyter-notebook
+Architecture: all
+Depends: ${misc:Depends},
+         python3-notebook (= ${binary:Version})
+Description: Jupyter interactive notebook
+ The Jupyter Notebook is a web application that allows you to create and
+ share documents that contain live code, equations, visualizations, and
+ explanatory text. The Notebook has support for multiple programming
+ languages, sharing, and interactive widgets.
+ .
+ This package contains the jupyter-notebook script.
diff --git a/debian/jupyter-notebook.install b/debian/jupyter-notebook.install
new file mode 100644
index 0000000..e772481
--- /dev/null
+++ b/debian/jupyter-notebook.install
@@ -0,0 +1 @@
+usr/bin
diff --git a/debian/python3-notebook.manpages b/debian/jupyter-notebook.manpages
similarity index 100%
rename from debian/python3-notebook.manpages
rename to debian/jupyter-notebook.manpages
diff --git a/debian/python3-notebook-doc.docs b/debian/python-notebook-doc.docs
similarity index 100%
rename from debian/python3-notebook-doc.docs
rename to debian/python-notebook-doc.docs
diff --git a/debian/python-notebook.install b/debian/python-notebook.install
new file mode 100644
index 0000000..b2cc136
--- /dev/null
+++ b/debian/python-notebook.install
@@ -0,0 +1 @@
+usr/lib/python2*
diff --git a/debian/python3-notebook.install b/debian/python3-notebook.install
new file mode 100644
index 0000000..4606faa
--- /dev/null
+++ b/debian/python3-notebook.install
@@ -0,0 +1 @@
+usr/lib/python3*
diff --git a/debian/rules b/debian/rules
index dbbfc4b..a1c3a17 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,5 @@
 #!/usr/bin/make -f
 
-export PYBUILD_NAME=notebook
-
 JSBASE:=/usr/share/javascript
 COMP:=notebook/static/components
 
@@ -9,7 +7,7 @@ export PYBUILD_AFTER_INSTALL=rm -rf '{destdir}/{install_dir}/notebook/static/com
 export LC_ALL=C.UTF-8
 
 %:
-	dh $@ --with=python3,sphinxdoc --buildsystem=pybuild
+	dh $@ --with=python2,python3,sphinxdoc --buildsystem=pybuild
 
 override_dh_auto_configure:
 	#backbone

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/jupyter-notebook.git