[spyder] 11/14: Install spyder{,3} files with debhelper

[Ghislain Vaillant]

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

ghisvail-guest pushed a commit to branch master
in repository spyder.

commit 9dcc47283fd33ced650a793d88153300aeed426d
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Fri Sep 22 14:17:02 2017 +0100

    Install spyder{,3} files with debhelper
---
 debian/rules | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/debian/rules b/debian/rules
index fa58a9f..225bab5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,11 +3,13 @@
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
+
 export PYBUILD_NAME=spyder
+export PYBUILD_DESTDIR_python2=debian/python-$(PYBUILD_NAME)
+export PYBUILD_DESTDIR_python3=debian/python3-$(PYBUILD_NAME)
 export PYBUILD_BUILD_ARGS=--no-doc
-export PYBUILD_INSTALL_ARGS=--no-doc
-export PYBUILD_AFTER_INSTALL=rm -rf {destdir}/usr/bin/ {destdir}/usr/share
-
+export PYBUILD_INSTALL_ARGS=--no-doc --install-data=usr --install-scripts=usr/bin
+export PYBUILD_AFTER_INSTALL=rm -f {destdir}/usr/bin/spyder_win_post_install.py
 
 %:
 	dh $@ --with python2,python3,sphinxdoc --buildsystem=pybuild
@@ -22,16 +24,10 @@ override_dh_auto_build:
 
 override_dh_auto_install:
 	dh_auto_install
-
-	# install the spyder files
-	python setup.py install_scripts -d debian/spyder/usr/bin
-	python setup.py install_data -d debian/spyder/usr
-	rm -f debian/spyder/usr/bin/spyder_win_post_install.py
-
-	# install the spyder3 files
-	python3 setup.py install_scripts -d debian/spyder3/usr/bin
-	python3 setup.py install_data -d debian/spyder3/usr
-	rm -f debian/spyder3/usr/bin/spyder_win_post_install.py
+	dh_movefiles --package=spyder --sourcedir=$(PYBUILD_DESTDIR_python2) usr/bin usr/share
+	find $(PYBUILD_DESTDIR_python2) -type d -empty -delete
+	dh_movefiles --package=spyder3 --sourcedir=$(PYBUILD_DESTDIR_python3) usr/bin usr/share
+	find $(PYBUILD_DESTDIR_python3) -type d -empty -delete
 
 # skip tests for now
 override_dh_auto_test:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/spyder.git