[Python-modules-commits] [django-reversion] 11/12: Build documentation in override_dh_sphinxdoc.

Michael Fladischer fladi at moszumanska.debian.org
Sat Jan 27 12:28:15 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-reversion.

commit eeebabed3dc253f7a4578e8d929608e809992033
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Sat Jan 27 11:59:36 2018 +0100

    Build documentation in override_dh_sphinxdoc.
---
 debian/changelog                        | 1 +
 debian/python-django-reversion-doc.docs | 1 -
 debian/rules                            | 9 ++++++++-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 74b1c3e..43e7da1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ django-reversion (2.0.13-1) UNRELEASED; urgency=low
   * Bump minimum required Python2 version to 2.7 and Python3 to 3.4.
   * Remove lintian override for missing GPG signature check on source
     tarball to serve as a reminder to improve on this.
+  * Build documentation in override_dh_sphinxdoc.
 
  -- Michael Fladischer <fladi at debian.org>  Sat, 27 Jan 2018 11:37:27 +0100
 
diff --git a/debian/python-django-reversion-doc.docs b/debian/python-django-reversion-doc.docs
deleted file mode 100644
index 2981a3c..0000000
--- a/debian/python-django-reversion-doc.docs
+++ /dev/null
@@ -1 +0,0 @@
-docs/.build/html
diff --git a/debian/rules b/debian/rules
index 1043dee..4780ba9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,8 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+include /usr/share/dpkg/pkg-info.mk
+
 export PYBUILD_NAME=django-reversion
 
 %:
@@ -17,7 +19,12 @@ override_dh_auto_build:
 		python setup.py compile_catalog --directory reversion/locale/ --locale $$(basename $$loc) --domain django; \
 	done
 	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 -D today="$(BUILD_DATE)" -b html -N docs/ $(CURDIR)/debian/python-django-reversion-doc/usr/share/doc/python-django-reversion-doc/html
+	dh_sphinxdoc
+endif
 
 override_dh_installchangelogs:
 	dh_installchangelogs CHANGELOG.rst

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



More information about the Python-modules-commits mailing list