[Python-modules-commits] [cf-python] 11/16: Updated doc building.

[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 324463005be8506859d9be74b0a89554c2f7180e
Author: Klaus Zimmermann <klaus_zimmermann at gmx.de>
Date:   Mon Sep 12 15:03:02 2016 +0200

    Updated doc building.
    
    Signed-off-by: Klaus Zimmermann <klaus_zimmermann at gmx.de>
---
 debian/control                |  7 ++++++-
 debian/python-cf-doc.doc-base |  4 ++--
 debian/python-cf-doc.docs     |  3 +--
 debian/rules                  | 24 +++++++++++++++---------
 4 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/debian/control b/debian/control
index 9a73aee..85ebaca 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,12 @@ Build-Depends:
  python-numpy,
  libudunits2-0,
  python-matplotlib,
- python-sphinx
+ python-sphinx,
+ sphinx-doc,
+ python-matplotlib-doc,
+ python-numpy-doc,
+ python-scipy-doc,
+ python-doc
 Standards-Version: 3.9.8
 Homepage: http://cfpython.bitbucket.org/
 Vcs-Git: https://anonscm.debian.org/git/python-modules/packages/cf-python.git
diff --git a/debian/python-cf-doc.doc-base b/debian/python-cf-doc.doc-base
index cdc6014..7be465a 100644
--- a/debian/python-cf-doc.doc-base
+++ b/debian/python-cf-doc.doc-base
@@ -7,5 +7,5 @@ Abstract: This manual describes the use of the cf
 Section: Science/Geoscience
 
 Format: HTML
-Index: /usr/share/doc/python-cf-doc/build/index.html
-Files: /usr/share/doc/python-cf-doc/build/*.html
+Index: /usr/share/doc/python-cf-doc/html/index.html
+Files: /usr/share/doc/python-cf-doc/html/*.html
diff --git a/debian/python-cf-doc.docs b/debian/python-cf-doc.docs
index b8bc1fe..a213c54 100644
--- a/debian/python-cf-doc.docs
+++ b/debian/python-cf-doc.docs
@@ -1,2 +1 @@
-docs/build
-
+docs/build/html
diff --git a/debian/rules b/debian/rules
index 7b89791..5a198cf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,24 +6,30 @@
 export PYBUILD_NAME=cf
 
 %:
-	dh $@  --with python2 --buildsystem=pybuild
+	dh $@  --with python2,sphinxdoc --buildsystem=pybuild
 
+override_dh_auto_clean:
+	dh_auto_clean
+	rm -rf docs/build/*
+
+override_dh_auto_build:
+	dh_auto_build
+	cd docs && sphinx-build -E -b html source build/html
 
 override_dh_auto_test:
 	dh_auto_test -O--buildsystem=pybuild -- --system=custom \
                      --before-test 'cp -R {dir}/test {build_dir}; echo {build_dir}/test >> {home_dir}/build_dirs_to_rm_before_install; cp {dir}/debian/test_file.nc {build_dir}/test' \
                      --test-args='cd {build_dir}; {interpreter} test/run_tests.py'
 
-
 override_dh_installdocs:
 	dh_installdocs
-	ln -s /usr/share/javascript/mathjax/MathJax.js $(CURDIR)/docs/build/_static/
-	ln -s /usr/share/javascript/underscore.js $(CURDIR)/docs/build/_static/
-	ln -s /usr/share/javascript/jquery/jquery.js $(CURDIR)/docs/build/_static/
-	ln -s /usr/share/javascript/jquery/jquery.min.js $(CURDIR)/docs/build/_static/
-	find docs/build -name "*.html" -exec sed -i "s|https://cdn.mathjax.org/mathjax/latest/MathJax.js|_static/MathJax.js|" {} \;
-	find docs/build -name "*.html" -exec sed -i "s|https://cdnjs.cloudflare.com/ajax/libs/jquery/2.0.3/jquery.min.js|_static/jquery.min.js|" {} \;
-	dh_installdocs -ppython-cf-doc docs/build
+	ln -s /usr/share/javascript/mathjax/MathJax.js $(CURDIR)/docs/build/html/_static/
+	ln -s /usr/share/javascript/underscore.js $(CURDIR)/docs/build/html/_static/
+	ln -s /usr/share/javascript/jquery/jquery.js $(CURDIR)/docs/build/html/_static/
+	ln -s /usr/share/javascript/jquery/jquery.min.js $(CURDIR)/docs/build/html/_static/
+	find docs/build/html -name "*.html" -exec sed -i "s|https://cdn.mathjax.org/mathjax/latest/MathJax.js|_static/MathJax.js|" {} \;
+	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|" {} \;
+	dh_installdocs -ppython-cf-doc docs/build/html
 
 # If you need to rebuild the Sphinx documentation
 # Add spinxdoc to the dh --with line

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