[Python-modules-commits] [jupyter-core] 12/12: 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-core.

commit 1d0829a333019cd2fa471acbfb304bddd52f61ae
Author: Julien Cristau <julien.cristau at logilab.fr>
Date:   Fri Apr 8 11:34:00 2016 +0200

    Use dh_install instead of PYBUILD_NAME.
---
 debian/changelog                    |  1 +
 debian/control                      |  2 +-
 debian/jupyter-core.install         |  1 +
 debian/python-jupyter-core.install  |  1 +
 debian/python3-jupyter-core.install |  1 +
 debian/rules                        | 12 ------------
 6 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ef39bc6..bc7838f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,5 +11,6 @@ jupyter-core (4.1.0-1) UNRELEASED; urgency=medium
   * Add DPMT to Uploaders
   * Bump Standards-Version to 3.9.7.
   * Install new jupyter-troubleshoot entry point.
+  * Use dh_install instead of PYBUILD_NAME.
 
  -- Julien Cristau <julien.cristau at logilab.fr>  Fri, 08 Apr 2016 11:05:14 +0200
diff --git a/debian/control b/debian/control
index 5eb6f67..724d3ad 100644
--- a/debian/control
+++ b/debian/control
@@ -53,7 +53,7 @@ Description: Core common functionality of Jupyter projects for Python 3
 Package: jupyter-core
 Architecture: all
 Section: utils
-Depends: ${misc:Depends}, ${python:Depends}, python-jupyter-core (= ${binary:Version})
+Depends: ${misc:Depends}, ${python3:Depends}, python3-jupyter-core (= ${binary:Version})
 Description: Core common functionality of Jupyter projects (tools)
  This software component contains the base framework (application
  classes and configurations) for the rest of the Jupyter projects ; it
diff --git a/debian/jupyter-core.install b/debian/jupyter-core.install
new file mode 100644
index 0000000..e772481
--- /dev/null
+++ b/debian/jupyter-core.install
@@ -0,0 +1 @@
+usr/bin
diff --git a/debian/python-jupyter-core.install b/debian/python-jupyter-core.install
new file mode 100644
index 0000000..b2cc136
--- /dev/null
+++ b/debian/python-jupyter-core.install
@@ -0,0 +1 @@
+usr/lib/python2*
diff --git a/debian/python3-jupyter-core.install b/debian/python3-jupyter-core.install
new file mode 100644
index 0000000..4606faa
--- /dev/null
+++ b/debian/python3-jupyter-core.install
@@ -0,0 +1 @@
+usr/lib/python3*
diff --git a/debian/rules b/debian/rules
index 87af536..bf5d9b9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,6 @@
 #!/usr/bin/make -f
 
 #export DH_VERBOSE=1
-export PYBUILD_NAME=jupyter-core
 export LC_ALL=C.UTF-8
 export PYBUILD_TEST_ARGS={interpreter} -m unittest discover -s tests -t jupyter_core -v
 
@@ -11,17 +10,6 @@ export PYBUILD_TEST_ARGS={interpreter} -m unittest discover -s tests -t jupyter_
 override_dh_auto_test:
 	PYBUILD_SYSTEM=custom dh_auto_test
 
-override_dh_auto_install:
-	dh_auto_install
-
-	mkdir -p debian/jupyter-core/usr/bin
-	cp debian/python-jupyter-core/usr/bin/jupyter-troubleshoot debian/jupyter-core/usr/bin/
-	cp debian/python-jupyter-core/usr/bin/jupyter-migrate debian/jupyter-core/usr/bin/
-	cp debian/python-jupyter-core/usr/bin/jupyter debian/jupyter-core/usr/bin/
-
-	rm -r debian/python-jupyter-core/usr/bin
-	rm -r debian/python3-jupyter-core/usr/bin
-
 override_dh_sphinxdoc:
 ifeq (,$(findstring nodocs, $(DEB_BUILD_OPTIONS)))
 	PYTHONPATH=. sphinx-build -b html docs debian/python-jupyter-core-doc/usr/share/doc/python-jupyter-core-doc/html

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