[Python-modules-commits] [python-mock] 06/07: Correctly build doc in the override_dh_sphinxdoc and not in auto_build.

[Ondřej Nový]

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

onovy-guest pushed a commit to branch master
in repository python-mock.

commit f7ee83cf6a21b4d6d8a978b1d49b35074004c7d5
Author: Ondřej Nový <novy at ondrej.org>
Date:   Tue Jun 7 10:10:43 2016 +0200

    Correctly build doc in the override_dh_sphinxdoc and not in auto_build.
    
    Author: Thomas Goirand <zigo at debian.org>
---
 debian/changelog            |  1 +
 debian/python-mock-doc.docs |  1 -
 debian/rules                | 12 +++++-------
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a77c5c9..fe4c2b7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ python-mock (1.3.0-3) UNRELEASED; urgency=medium
   * debian/rules
     - using dpkg-parsechangelog -SVersion and not -S Version, as Trusty
       wouldn't accept the space
+    - Correctly build doc in the override_dh_sphinxdoc and not in auto_build.
   * Using debian/source/options to ignore egg-info changes instead of
     cleaning the files.
   * Bump debhelper to 9 instead of 8
diff --git a/debian/python-mock-doc.docs b/debian/python-mock-doc.docs
deleted file mode 100644
index 2981a3c..0000000
--- a/debian/python-mock-doc.docs
+++ /dev/null
@@ -1 +0,0 @@
-docs/.build/html
diff --git a/debian/rules b/debian/rules
index 7d38f07..3096179 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,16 +9,14 @@ export PYBUILD_NAME=mock
 %:
 	dh $@ --with python2,python3,sphinxdoc --buildsystem=pybuild
 
-override_dh_auto_build:
-	dh_auto_build
-	PYTHONPATH=. sphinx-build -b html -N docs/ docs/.build/html
+override_dh_sphinxdoc:
+ifeq (,$(findstring nodocs, $(DEB_BUILD_OPTIONS)))
+	PYTHONPATH=. sphinx-build -b html -N docs/ debian/python-mock-doc/usr/share/doc/python-mock-doc/html
+	dh_sphinxdoc
+endif
 
 override_dh_installchangelogs:
 	dh_installchangelogs -- docs/changelog.txt
 
 override_dh_compress:
 	dh_compress -X.js -X.html -X.txt
-
-override_dh_clean:
-	rm -rf docs/.build
-	dh_clean

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