[pyfai] 05/06: refresh the rules file

[Frédéric-Emmanuel Picca]

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

picca pushed a commit to branch master
in repository pyfai.

commit ddf400e20f8cd90589f32a39136f2a73e380ac49
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date:   Wed Aug 17 15:25:55 2016 +0200

    refresh the rules file
---
 debian/control |  2 ++
 debian/rules   | 34 ++++++++++++++--------------------
 2 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/debian/control b/debian/control
index caac87f..a11fd5d 100644
--- a/debian/control
+++ b/debian/control
@@ -28,6 +28,7 @@ Build-Depends: cython,
                python-qt4-dbg,
                python-scipy,
                python-scipy-dbg,
+               python-setuptools,
                python-sphinx,
                python-sphinxcontrib.programoutput,
                python-tk,
@@ -46,6 +47,7 @@ Build-Depends: cython,
                python3-pyqt4-dbg,
                python3-scipy,
                python3-scipy-dbg,
+               python3-setuptools,
                python3-sphinx,
                python3-sphinxcontrib.programoutput,
                python3-tk,
diff --git a/debian/rules b/debian/rules
index 2c5049b..b8c7b1c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +1,10 @@
 #!/usr/bin/make -f
 
 export PYBUILD_NAME=pyfai
-export PYBUILD_DISABLE_python2-dbg=test
-export PYBUILD_DISABLE_python3=test
-export PYBUILD_DISABLE_python3-dbg=test
+#export PYBUILD_DISABLE_python2-dbg=test
+#export PYBUILD_DISABLE_python3=test
+#export PYBUILD_DISABLE_python3-dbg=test
+export PYBUILD_AFTER_INSTALL=rm -rf {destdir}/usr/bin/
 
 %:
 	dh $@ --with python2,python3,sphinxdoc --buildsystem=pybuild
@@ -11,16 +12,10 @@ export PYBUILD_DISABLE_python3-dbg=test
 override_dh_clean:
 	dh_clean
 	rm -f $(patsubst %.pyx,%.c,$(wildcard pyFAI/ext/*.pyx))
-	rm -rf build/html
+	rm -rf doc/build/html
 	rm -rf *.egg-info
 	rm -f all_testimage.json fai_cfg.json lima_cfg.json profile.log
 
-override_dh_auto_build:
-	dh_auto_build
-	PYBUILD_SYSTEM=custom \
-	PYBUILD_BUILD_ARGS="PYTHONPATH={build_dir} PYFAI_DATA=$(shell pwd) http_proxy='localhost' sphinx-build -N -bhtml doc/source build/html" dh_auto_build
-
-# unactive test for now
 override_dh_auto_test:
 	PYBUILD_SYSTEM=custom \
 	PYBUILD_TEST_ARGS="PYTHONPATH={build_dir} PYFAI_TESTIMAGES=testimages PYFAI_DATA=$(shell pwd) {interpreter} ./run_tests.py" dh_auto_test
@@ -29,13 +24,8 @@ override_dh_install:
 	dh_numpy
 	dh_numpy3
 
-	# move the scripts to right package
-	dh_install -p pyfai debian/python-pyfai/usr/bin usr/
-	# remove all scripts installed by pybuild
-	rm -rf debian/python-pyfai/usr/bin
-	rm -rf debian/python-pyfai-dbg/usr/bin
-	rm -rf debian/python3-pyfai/usr/bin
-	rm -rf debian/python3-pyfai-dbg/usr/bin
+        # install scripts into pyfai
+	python setup.py install_scripts -d debian/pyfai/usr/bin
 
 	# Finally install stuff
 	dh_install
@@ -43,6 +33,10 @@ override_dh_install:
 override_dh_installman:
 	dh_installman -p pyfai doc/*.1
 
-override_dh_installdocs:
-	dh_installdocs "build/html" -p python-pyfai-doc
-	dh_installdocs
+override_dh_sphinxdoc:
+ifeq (,$(findstring nodocs, $(DEB_BUILD_OPTIONS)))
+	PYBUILD_SYSTEM=custom \
+	PYBUILD_BUILD_ARGS="cd doc && PYTHONPATH={build_dir} http_proxy='127.0.0.1:9' {interpreter} -c \"import sys;from sphinx import main;sys.exit(main(sys.argv))\" -N -bhtml source build/html" dh_auto_build  # HTML generator
+	dh_installdocs "doc/build/html" -p python-pyfai-doc
+	dh_sphinxdoc -O--buildsystem=pybuild
+endif

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