[Python-modules-commits] [python-amqp] 05/07: * Properly building docs from override_dh_sphinxdoc and respecting DEB_BUILD_OPTIONS=nodoc, plus handling build profiles (also with nocheck).

[Thomas Goirand]

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

zigo pushed a commit to branch master
in repository python-amqp.

commit c01dd969121118b0e8b3e7242075db3529d5c71d
Author: Thomas Goirand <zigo at debian.org>
Date:   Sat Nov 4 21:13:34 2017 +0000

      * Properly building docs from override_dh_sphinxdoc and respecting
        DEB_BUILD_OPTIONS=nodoc, plus handling build profiles (also with nocheck).
---
 debian/changelog |  2 ++
 debian/control   | 19 +++++++++++--------
 debian/rules     |  6 ++++--
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e2cc701..a38d4bb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ python-amqp (2.2.1-1) unstable; urgency=medium
   * Removed X-Python-Version: >= 2.5 and X-Python3-Version: >= 3.0, as these
     versions are even satisfied in oldoldstable.
   * Standards-Version is now 4.1.1.
+  * Properly building docs from override_dh_sphinxdoc and respecting
+    DEB_BUILD_OPTIONS=nodoc, plus handling build profiles (also with nocheck).
 
  -- Thomas Goirand <zigo at debian.org>  Sat, 04 Nov 2017 20:57:21 +0000
 
diff --git a/debian/control b/debian/control
index 37962df..01d20ce 100644
--- a/debian/control
+++ b/debian/control
@@ -16,14 +16,14 @@ Build-Depends:
  python3-setuptools,
 Build-Depends-Indep:
  libjs-jquery,
- python-case,
- python-pytest,
- python-vine,
- python3-case,
- python3-pytest,
- python3-sphinx,
- python3-sphinx-celery,
- python3-vine,
+ python-case <!nocheck>,
+ python-pytest <!nocheck>,
+ python-vine <!nocheck>,
+ python3-case <!nocheck>,
+ python3-pytest <!nocheck>,
+ python3-sphinx <!nodoc>,
+ python3-sphinx-celery <!nodoc>,
+ python3-vine <!nocheck>,
 Standards-Version: 4.1.1
 Homepage: https://github.com/celery/py-amqp
 Vcs-Git: https://anonscm.debian.org/git/python-modules/packages/python-amqp.git
@@ -32,6 +32,7 @@ Vcs-Browser: https://anonscm.debian.org/cgit/python-modules/packages/python-amqp
 Package: python-amqp
 Architecture: all
 Depends:
+ python-vine,
  ${misc:Depends},
  ${python:Depends},
 Suggests:
@@ -62,6 +63,7 @@ Description: Low-level AMQP client
 Package: python-amqp-doc
 Section: doc
 Architecture: all
+Build-Profiles: <!nodoc>
 Depends:
  ${misc:Depends},
  ${sphinxdoc:Depends},
@@ -93,6 +95,7 @@ Description: Low-level AMQP client (Documentation)
 Package: python3-amqp
 Architecture: all
 Depends:
+ python3-vine,
  ${misc:Depends},
  ${python3:Depends},
 Suggests:
diff --git a/debian/rules b/debian/rules
index 83b24ec..9e26d56 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,9 +13,11 @@ export PYBUILD_AFTER_TEST=rm -rf {build_dir}/t
 %:
 	dh $@ --with python2,python3,sphinxdoc --buildsystem=pybuild
 
-override_dh_auto_build:
-	dh_auto_build
+override_dh_sphinxdoc:
+ifeq (,$(findstring nodoc, $(DEB_BUILD_OPTIONS)))
 	PYTHONPATH=. sphinx-build -D today="$(BUILD_DATE)" -b html -N docs/ docs/.build/html
+	dh_sphinxdoc
+endif
 
 override_dh_clean:
 	rm -rf docs/.build

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