[Python-modules-commits] [nevow] 08/08: Build docs with sphinx now.

[Tristan Seligmann]

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

mithrandi pushed a commit to branch master
in repository nevow.

commit cac5272cecba6c2d56db4cd7c5597e6fb109c5f0
Author: Tristan Seligmann <mithrandi at debian.org>
Date:   Wed Feb 3 17:00:08 2016 +0200

    Build docs with sphinx now.
---
 debian/changelog             | 1 +
 debian/control               | 2 +-
 debian/python-nevow.doc-base | 4 ++--
 debian/rules                 | 9 ++++++++-
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 16955ff..ad58aa8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ nevow (0.12.0-1) unstable; urgency=medium
 
   * New upstream release.
     - Update upstream keyring.
+    - Build docs with sphinx now.
   * Use https in Vcs-Git.
 
  -- Tristan Seligmann <mithrandi at debian.org>  Wed, 03 Feb 2016 16:41:10 +0200
diff --git a/debian/control b/debian/control
index 07926e3..19beee3 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Uploaders:
  Tristan Seligmann <mithrandi at debian.org>,
 Standards-Version: 3.9.6
 Build-Depends: debhelper (>= 9), dh-python, python-all, python-setuptools
-Build-Depends-Indep: python-twisted
+Build-Depends-Indep: python-sphinx, python-twisted, sphinx-common
 Vcs-Git: https://anonscm.debian.org/git/python-modules/packages/nevow.git
 Vcs-Browser: https://anonscm.debian.org/cgit/python-modules/packages/nevow.git
 Homepage: https://github.com/twisted/nevow
diff --git a/debian/python-nevow.doc-base b/debian/python-nevow.doc-base
index 2fecc3f..41eb86d 100644
--- a/debian/python-nevow.doc-base
+++ b/debian/python-nevow.doc-base
@@ -7,5 +7,5 @@ Abstract: This document is an introduction to Nevow, a next-generation
 Section: Programming/Python
 
 Format: html
-Index: /usr/share/doc/python-nevow/howto/index.xhtml
-Files: /usr/share/doc/python-nevow/howto/*.xhtml
+Index: /usr/share/doc/python-nevow/html/index.html
+Files: /usr/share/doc/python-nevow/html/*.html /usr/share/doc/python-nevow/html/howto/*.html
diff --git a/debian/rules b/debian/rules
index 3fc6d6c..54cb12b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,17 +4,24 @@ export PYTHONDONTWRITEBYTECODE=yes
 export PYBUILD_NAME=nevow
 
 %:
-	dh $@ --with python2 --buildsystem=pybuild
+	dh $@ --with python2,sphinxdoc --buildsystem=pybuild
 
 override_dh_auto_install:
 	dh_auto_install
 	rm -rf debian/python-nevow/usr/doc
 
+override_dh_sphinxdoc:
+ifeq (,$(findstring nodocs, $(DEB_BUILD_OPTIONS)))
+	PYTHONPATH=debian/python-nevow/usr/lib/python2.7/dist-packages http_proxy='127.0.0.1:9' sphinx-build -N -bhtml doc debian/python-nevow/usr/share/doc/python-nevow/html
+	dh_sphinxdoc
+endif
+
 override_dh_auto_test:
 	ln -s doc .pybuild/pythonX.Y_2.7/build
 	PYBUILD_SYSTEM=custom \
 	PYBUILD_TEST_ARGS="{interpreter} /usr/bin/trial nevow formless" dh_auto_test
 	rm .pybuild/pythonX.Y_2.7/build/doc
+	find .pybuild -name dropin.cache -delete
 
 override_dh_compress:
 	dh_compress -X.py -X.tac

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