[Python-modules-commits] [nbconvert] 01/01: Split jupyter-nbconvert script into a separate 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 nbconvert.

commit d8aa6c8b1455e4bfbc4caf6510e92a4ffbab6ef1
Author: Gordon Ball <gordon at chronitis.net>
Date:   Tue Nov 1 20:07:15 2016 +0100

    Split jupyter-nbconvert script into a separate package
---
 debian/changelog                                             |  7 ++++++-
 debian/control                                               | 12 +++++++++++-
 debian/jupyter-nbconvert.install                             |  1 +
 ...{python-nbconvert.manpages => jupyter-nbconvert.manpages} |  0
 debian/python-nbconvert.install                              |  1 +
 debian/python-nbconvert.lintian-overrides                    |  3 ---
 debian/python3-nbconvert.install                             |  1 +
 debian/rules                                                 |  5 +----
 8 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8727060..754b936 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,13 @@
 nbconvert (4.2.0-2) UNRELEASED; urgency=medium
 
+  [ Julien Puydt ]
   * Push dh compat to 10.
 
- -- Julien Puydt <julien.puydt at laposte.net>  Tue, 01 Nov 2016 14:22:10 +0100
+  [ Gordon Ball ]
+  * Split the jupyter-nbconvert script into a separate package (also named
+    jupyter-nbconvert), which depends on the python 3 library package.
+
+ -- Gordon Ball <gordon at chronitis.net>  Tue, 01 Nov 2016 20:04:07 +0100
 
 nbconvert (4.2.0-1) experimental; urgency=medium
 
diff --git a/debian/control b/debian/control
index d13881b..f62fd64 100644
--- a/debian/control
+++ b/debian/control
@@ -46,7 +46,7 @@ Build-Depends: debhelper (>= 10),
                texlive-latex-base,
                texlive-latex-extra
 X-Python-Version: >= 2.7
-X-Python3-Version: >= 3.2
+X-Python3-Version: >= 3.3
 Vcs-Git: https://anonscm.debian.org/git/python-modules/packages/nbconvert.git
 Vcs-Browser: https://anonscm.debian.org/cgit/python-modules/packages/nbconvert.git
 
@@ -67,3 +67,13 @@ Description: Jupyter notebook conversion (Python 3)
  using Jinja templates.
  .
  This package installs the library for Python 3.
+
+Package: jupyter-nbconvert
+Architecture: all
+Depends: ${misc:Depends}, ${python3:Depends}, python3-nbconvert (= ${binary:Version})
+Section: utils
+Description: Jupyter notebook conversion (scripts)
+ Jupyter nbconvert converts notebooks to various other formats
+ using Jinja templates.
+ .
+ This package installs the jupyter-nbconvert script.
diff --git a/debian/jupyter-nbconvert.install b/debian/jupyter-nbconvert.install
new file mode 100644
index 0000000..e772481
--- /dev/null
+++ b/debian/jupyter-nbconvert.install
@@ -0,0 +1 @@
+usr/bin
diff --git a/debian/python-nbconvert.manpages b/debian/jupyter-nbconvert.manpages
similarity index 100%
rename from debian/python-nbconvert.manpages
rename to debian/jupyter-nbconvert.manpages
diff --git a/debian/python-nbconvert.install b/debian/python-nbconvert.install
new file mode 100644
index 0000000..b2cc136
--- /dev/null
+++ b/debian/python-nbconvert.install
@@ -0,0 +1 @@
+usr/lib/python2*
diff --git a/debian/python-nbconvert.lintian-overrides b/debian/python-nbconvert.lintian-overrides
deleted file mode 100644
index fb34c91..0000000
--- a/debian/python-nbconvert.lintian-overrides
+++ /dev/null
@@ -1,3 +0,0 @@
-# this is just a helper tool
-python-nbconvert: library-package-name-for-application usr/bin/jupyter-nbconvert
-python-nbconvert: application-in-library-section python usr/bin/jupyter-nbconvert
diff --git a/debian/python3-nbconvert.install b/debian/python3-nbconvert.install
new file mode 100644
index 0000000..4606faa
--- /dev/null
+++ b/debian/python3-nbconvert.install
@@ -0,0 +1 @@
+usr/lib/python3*
diff --git a/debian/rules b/debian/rules
index dd52619..6d22ea9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,6 @@
 
 #export DH_VERBOSE=1
 export LC_ALL=C.UTF-8
-export PYBUILD_NAME=nbconvert
 export PYBUILD_TEST_ARGS=-v
 
 # add ",sphinxdoc" when nbsphinx is in Debian
@@ -12,9 +11,7 @@ export PYBUILD_TEST_ARGS=-v
 
 override_dh_auto_install:
 	dh_auto_install
-	rm -r `find debian/python-nbconvert -name tests -type d`
-	rm -r debian/python3-nbconvert/usr/bin
-	rm -r `find debian/python3-nbconvert -name tests -type d`
+	rm -r `find debian/tmp -name tests -type d`
 
 override_dh_sphinxdoc:
 ifeq (,$(findstring nodocs, $(DEB_BUILD_OPTIONS)))

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