[Python-modules-commits] [nbformat] 01/01: Split jupyter-trust 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 nbformat.

commit 147aad32dab604c923fe7087d8522ca23d88240d
Author: Gordon Ball <gordon at chronitis.net>
Date:   Tue Nov 1 20:13:50 2016 +0100

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

diff --git a/debian/changelog b/debian/changelog
index 23bfd3b..69647a1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,13 @@
 nbformat (4.1.0-2) UNRELEASED; urgency=medium
 
-  * Push dh compat up to 10. 
+  [ Julien Puydt ]
+  * Push dh compat up to 10.
+
+  [ Gordon Ball ]
+  * Split the jupyter-trust script into a separate package (also named
+    jupyter-trust), which depends on the python 3 library package.
 
- -- Julien Puydt <julien.puydt at laposte.net>  Tue, 01 Nov 2016 14:23:05 +0100
+ -- Gordon Ball <gordon at chronitis.net>  Tue, 01 Nov 2016 20:09:28 +0100
 
 nbformat (4.1.0-1) experimental; urgency=medium
 
diff --git a/debian/control b/debian/control
index 5ed5354..388825e 100644
--- a/debian/control
+++ b/debian/control
@@ -28,7 +28,7 @@ Build-Depends: bc,
                python3-testpath,
                python3-traitlets
 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/nbformat.git
 Vcs-Browser: https://anonscm.debian.org/cgit/python-modules/packages/nbformat.git
 
@@ -39,8 +39,7 @@ Description: Jupyter notebook format (Python 2)
  This software component contains the reference implementation of the Jupyter
  notebook format, and Python APIs to work with notebooks.
  .
- This package installs the library for Python 2, and a tool to sign
- notebooks.
+ This package installs the library for Python 2.
 
 Package: python3-nbformat
 Architecture: all
@@ -51,6 +50,16 @@ Description: Jupyter notebook format (Python 3)
  .
  This package installs the library for Python 3.
 
+Package: jupyter-trust
+Architecture: all
+Depends: ${misc:Depends}, ${python3:Depends}, python3-nbformat (= ${binary:Version})
+Section: utils
+Description: Jupyter notebook format
+ This software component contains the reference implementation of the Jupyter
+ notebook format, and Python APIs to work with notebooks.
+ .
+ This package installs the notebook signing tool.
+
 Package: python-nbformat-doc
 Section: doc
 Architecture: all
diff --git a/debian/jupyter-trust.install b/debian/jupyter-trust.install
new file mode 100644
index 0000000..e772481
--- /dev/null
+++ b/debian/jupyter-trust.install
@@ -0,0 +1 @@
+usr/bin
diff --git a/debian/python-nbformat.manpages b/debian/jupyter-trust.manpages
similarity index 100%
rename from debian/python-nbformat.manpages
rename to debian/jupyter-trust.manpages
diff --git a/debian/python-nbformat.install b/debian/python-nbformat.install
new file mode 100644
index 0000000..b2cc136
--- /dev/null
+++ b/debian/python-nbformat.install
@@ -0,0 +1 @@
+usr/lib/python2*
diff --git a/debian/python-nbformat.lintian-overrides b/debian/python-nbformat.lintian-overrides
deleted file mode 100644
index 210135a..0000000
--- a/debian/python-nbformat.lintian-overrides
+++ /dev/null
@@ -1,3 +0,0 @@
-# this is just a helper tool
-python-nbformat: library-package-name-for-application usr/bin/jupyter-trust
-python-nbformat: application-in-library-section python usr/bin/jupyter-trust
diff --git a/debian/python3-nbformat.install b/debian/python3-nbformat.install
new file mode 100644
index 0000000..4606faa
--- /dev/null
+++ b/debian/python3-nbformat.install
@@ -0,0 +1 @@
+usr/lib/python3*
diff --git a/debian/rules b/debian/rules
index de1f574..1c79574 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,16 +1,13 @@
 #!/usr/bin/make -f
 
 #export DH_VERBOSE=1
-export PYBUILD_NAME=nbformat
 
 %:
 	dh $@ --with python2,python3,sphinxdoc --buildsystem=pybuild
 
 override_dh_auto_install:
 	dh_auto_install
-	rm -r `find debian/python-nbformat -name tests -type d`
-	rm -r debian/python3-nbformat/usr/bin
-	rm -r `find debian/python3-nbformat -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/nbformat.git