[Python-modules-commits] [flask] 11/16: Use override_dh_sphinxdoc for building Sphinx docs and added nodocs support

[Ondřej Nový]

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

onovy pushed a commit to branch master
in repository flask.

commit 2bd6072140d0378ba11c728e870a36744e58c5e1
Author: Ondřej Nový <onovy at debian.org>
Date:   Mon Jul 18 11:56:55 2016 +0200

    Use override_dh_sphinxdoc for building Sphinx docs and added nodocs support
---
 debian/changelog | 2 ++
 debian/rules     | 6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ff0481b..ac6920e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,8 @@ flask (0.11.1-1) UNRELEASED; urgency=medium
   * Added python{3,}-click to build depends
   * Bumped required Python 2 version to 2.6
   * Enabled autopkgtest-pkg-python testsuite
+  * Use override_dh_sphinxdoc for building Sphinx docs and added nodocs
+    support
 
  -- Ondřej Nový <novy at ondrej.org>  Tue, 29 Mar 2016 21:36:03 +0200
 
diff --git a/debian/rules b/debian/rules
index 297f185..4d21161 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,9 +13,11 @@ override_dh_python3:
 	dh_python3 -p python3-flask
 	rm -rf debian/python3-flask/usr/lib/python3/dist-packages/flask/testsuite/
 
-override_dh_installdocs:
-	dh_installdocs
+override_dh_sphinxdoc:
+ifeq (,$(findstring nodocs, $(DEB_BUILD_OPTIONS)))
 	PYTHONPATH=. sphinx-build -N -q -E -b html docs/ debian/python-flask-doc/usr/share/doc/python-flask-doc/html/
+	dh_sphinxdoc
+endif
 
 override_dh_auto_clean:
 	dh_auto_clean

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