[python-fabio] 01/01: sphinx build is now working

[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 python-fabio.

commit 8d1b2f27bf3c957a01088e4db703379863b387cf
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date:   Thu Jul 28 07:06:23 2016 +0200

    sphinx build is now working
---
 debian/copyright |  4 ++--
 debian/rules     | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 5ee62b0..2657be2 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -140,10 +140,10 @@ License: MIT
  publish, distribute, sublicense, and/or sell copies of the Software,
  and to permit persons to whom the Software is furnished to do so,
  subject to the following conditions:
-
+ .
  The above copyright notice and this permission notice shall be
  included in all copies or substantial portions of the Software.
-
+ .
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
  OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
diff --git a/debian/rules b/debian/rules
index ee6a398..f55a767 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,8 +1,6 @@
 #!/usr/bin/make -f
 
 export PYBUILD_NAME=fabio
-export PYBUILD_AFTER_INSTALL_python2=dh_numpy
-export PYBUILD_AFTER_INSTALL_python3=dh_numpy3
 export PYBUILD_AFTER_INSTALL=rm -rf {destdir}/usr/bin/
 
 %:
@@ -11,7 +9,7 @@ export PYBUILD_AFTER_INSTALL=rm -rf {destdir}/usr/bin/
 override_dh_clean:
         # remove the cython generated files distributed by upstream
 	rm -f $(patsubst %.pyx,%.c,$(wildcard fabio/ext/*.pyx))
-	rm -rf build/html
+	rm -rf doc/build/html
 	rm -rf *.egg-info
 	dh_clean
 
@@ -22,6 +20,8 @@ override_dh_auto_test:
 
 override_dh_install:
 	dh_install
+	dh_numpy
+	dh_numpy3
 
         # install scripts into fabio-viewer
 	python setup.py install_scripts -d debian/fabio-viewer/usr/bin
@@ -32,7 +32,7 @@ override_dh_installman:
 override_dh_sphinxdoc:
 ifeq (,$(findstring nodocs, $(DEB_BUILD_OPTIONS)))
 	PYBUILD_SYSTEM=custom \
-	PYBUILD_BUILD_ARGS="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 doc/source build/html" dh_auto_build  # HTML generator
-	dh_installdocs "build/html" -p python-fabio-doc
+	PYBUILD_BUILD_ARGS="PYTHONPATH={build_dir} http_proxy='127.0.0.1:9' cd doc && {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-fabio-doc
 	dh_sphinxdoc -O--buildsystem=pybuild
 endif

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