[Python-modules-commits] [jupyter-client] 05/09: Use dh_install instead of PYBUILD_NAME

[Julien Cristau]

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

jcristau pushed a commit to branch master
in repository jupyter-client.

commit 0a4e6e4faa847cefb7e547a04d42026c5eac052a
Author: Julien Cristau <julien.cristau at logilab.fr>
Date:   Fri Apr 8 12:15:54 2016 +0200

    Use dh_install instead of PYBUILD_NAME
---
 debian/changelog                      |  3 +++
 debian/control                        |  2 +-
 debian/jupyter-client.install         |  1 +
 debian/python-jupyter-client.install  |  1 +
 debian/python3-jupyter-client.install |  1 +
 debian/rules                          | 10 ----------
 6 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0ba9d62..24eb529 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,4 +6,7 @@ jupyter-client (4.1.1-1) UNRELEASED; urgency=medium
   [ Ondřej Nový ]
   * Fixed VCS URL (https)
 
+  [ Julien Cristau ]
+  * Use dh_install instead of PYBUILD_NAME
+
  -- Julien Puydt <julien.puydt at laposte.net>  Sun, 11 Oct 2015 20:43:31 +0200
diff --git a/debian/control b/debian/control
index 4fe2557..664a6e9 100644
--- a/debian/control
+++ b/debian/control
@@ -38,7 +38,7 @@ Description: Jupyter protocol client APIs (Python 3)
 Package: jupyter-client
 Architecture: all
 Section: utils
-Depends: ${misc:Depends}, ${python:Depends}, python-jupyter-client (= ${binary:Version})
+Depends: ${misc:Depends}, ${python3:Depends}, python3-jupyter-client (= ${binary:Version})
 Description: Jupyter protocol client APIs (tools)
  This software component contains the reference implementation
  of the Jupyter protocol. It also provides client and kernel
diff --git a/debian/jupyter-client.install b/debian/jupyter-client.install
new file mode 100644
index 0000000..e772481
--- /dev/null
+++ b/debian/jupyter-client.install
@@ -0,0 +1 @@
+usr/bin
diff --git a/debian/python-jupyter-client.install b/debian/python-jupyter-client.install
new file mode 100644
index 0000000..b2cc136
--- /dev/null
+++ b/debian/python-jupyter-client.install
@@ -0,0 +1 @@
+usr/lib/python2*
diff --git a/debian/python3-jupyter-client.install b/debian/python3-jupyter-client.install
new file mode 100644
index 0000000..4606faa
--- /dev/null
+++ b/debian/python3-jupyter-client.install
@@ -0,0 +1 @@
+usr/lib/python3*
diff --git a/debian/rules b/debian/rules
index 6211094..2995aab 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,6 @@
 #!/usr/bin/make -f
 
 #export DH_VERBOSE=1
-export PYBUILD_NAME=jupyter-client
 export LC_ALL=C.UTF-8
 
 %:
@@ -10,15 +9,6 @@ export LC_ALL=C.UTF-8
 override_dh_auto_test:
 	@echo "Tests disabled to avoid circular dependencies"
 
-override_dh_auto_install:
-	dh_auto_install
-
-	mkdir -p debian/jupyter-client/usr/bin
-	cp debian/python-jupyter-client/usr/bin/jupyter-kernelspec debian/jupyter-client/usr/bin/
-
-	rm -r debian/python-jupyter-client/usr/bin
-	rm -r debian/python3-jupyter-client/usr/bin
-
 override_dh_sphinxdoc:
 ifeq (,$(findstring nodocs, $(DEB_BUILD_OPTIONS)))
 	PYTHONPATH=. sphinx-build -b html docs debian/python-jupyter-client-doc/usr/share/doc/python-jupyter-client-doc/html

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