[Python-modules-commits] [django-polymorphic] 12/13: Build documentation in override_dh_sphinxdoc.

Michael Fladischer fladi at moszumanska.debian.org
Sun Feb 4 13:19:39 UTC 2018


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

fladi pushed a commit to branch debian/master
in repository django-polymorphic.

commit 58150c280da51de05b8762bf6c4205c5efefe03c
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Sun Feb 4 14:12:40 2018 +0100

    Build documentation in override_dh_sphinxdoc.
---
 debian/changelog                          |  1 +
 debian/python-django-polymorphic-doc.docs |  1 -
 debian/rules                              | 10 +++++++---
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b2b9ffe..1336d81 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ django-polymorphic (2.0-1) UNRELEASED; urgency=low
   * Bump debhelper compatibility and version to 11.
   * Run wrap-and-sort -bast to reduce diff size of future changes.
   * Enable autopkgtest-pkg-python testsuite.
+  * Build documentation in override_dh_sphinxdoc.
 
  -- Michael Fladischer <fladi at debian.org>  Sat, 27 Jan 2018 13:52:50 +0100
 
diff --git a/debian/python-django-polymorphic-doc.docs b/debian/python-django-polymorphic-doc.docs
deleted file mode 100644
index 4ecc793..0000000
--- a/debian/python-django-polymorphic-doc.docs
+++ /dev/null
@@ -1 +0,0 @@
-docs/_build/html
diff --git a/debian/rules b/debian/rules
index cb06932..48561c1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,14 +3,18 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+include /usr/share/dpkg/pkg-info.mk
+
 export PYBUILD_NAME=django-polymorphic
 
 %:
 	dh $@ --with python2,python3,sphinxdoc --buildsystem=pybuild
 
-override_dh_auto_build:
-	dh_auto_build
-	PYTHONPATH=. sphinx-build -b html -d docs/_build/.doctrees -N docs docs/_build/html
+override_dh_sphinxdoc:
+ifeq (,$(findstring nodoc, $(DEB_BUILD_OPTIONS)))
+	PYTHONPATH=. sphinx-build -b html -N docs/ $(CURDIR)/debian/python-django-polymorphic-doc/usr/share/doc/python-django-polymorphic-doc/html
+	dh_sphinxdoc
+endif
 
 override_dh_auto_test:
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))

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



More information about the Python-modules-commits mailing list