[Python-modules-commits] [cf-python] 12/14: Improved building of sphinx docs.

[Klaus Zimmermann]

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

zklaus-guest pushed a commit to branch master
in repository cf-python.

commit 8e03407decff45f46262eed49f659b322af23b2f
Author: Klaus Zimmermann <klaus_zimmermann at gmx.de>
Date:   Mon Sep 19 12:47:26 2016 +0200

    Improved building of sphinx docs.
    
    Signed-off-by: Klaus Zimmermann <klaus_zimmermann at gmx.de>
---
 debian/control |  9 +++++----
 debian/rules   | 12 ++----------
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/debian/control b/debian/control
index 60508e4..37d76a7 100644
--- a/debian/control
+++ b/debian/control
@@ -9,15 +9,16 @@ Build-Depends:
  dh-python,
  libudunits2-0,
  python-all (>= 2.6.6-3~),
- python-doc,
  python-matplotlib,
- python-matplotlib-doc,
  python-netcdf4,
  python-numpy,
- python-numpy-doc,
  python-psutil,
- python-scipy-doc,
  python-setuptools,
+Build-Depends-Indep:
+ python-doc,
+ python-matplotlib-doc,
+ python-numpy-doc,
+ python-scipy-doc,
  python-sphinx,
  sphinx-doc,
 Standards-Version: 3.9.8
diff --git a/debian/rules b/debian/rules
index ab53679..6276e9c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,9 +8,8 @@ export PYBUILD_NAME=cf
 %:
 	dh $@  --with python2,sphinxdoc --buildsystem=pybuild
 
-override_dh_auto_build:
-	dh_auto_build
-	cd docs && sphinx-build -E -b html source build/html
+override_dh_auto_build-indep:
+	PYTHONPATH=. http_proxy='127.0.0.1:9' sphinx-build -E -b html docs/source docs/build/html
 
 override_dh_auto_test:
 	dh_auto_test -O--buildsystem=pybuild -- --system=custom \
@@ -26,10 +25,3 @@ override_dh_installdocs:
 	find docs/build/html -name "*.html" -exec sed -i "s|https://cdnjs.cloudflare.com/ajax/libs/jquery/2.0.3/jquery.min.js|_static/jquery.min.js|" {} \;
 	find docs/build/html -name "*.html" -exec sed -i "s|https://cdnjs.cloudflare.com/ajax/libs/require.js/2.1.10/require.min.js|_static/require.min.js|" {} \;
 	dh_installdocs -ppython-cf-doc docs/build/html
-
-# If you need to rebuild the Sphinx documentation
-# Add spinxdoc to the dh --with line
-#override_dh_auto_build:
-#	dh_auto_build
-#	PYTHONPATH=. http_proxy='127.0.0.1:9' sphinx-build -N -bhtml        docs/ build/html # HTML generator
-#	PYTHONPATH=. http_proxy='127.0.0.1:9' sphinx-build -N -bman        docs/ build/man # Manpage generator

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