[Python-modules-commits] [kombu] 05/08: * Correctly builds sphinx doc in override_dh_sphinxdoc, and understand build-profiles nodoc and nocheck..

[Thomas Goirand]

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

zigo pushed a commit to branch master
in repository kombu.

commit ba1ec644b0ee80ccc2f771feb2f6260bd2dbaeec
Author: Thomas Goirand <zigo at debian.org>
Date:   Sat Nov 4 21:50:06 2017 +0000

      * Correctly builds sphinx doc in override_dh_sphinxdoc, and understand
        build-profiles nodoc and nocheck..
---
 debian/changelog              |  2 ++
 debian/control                | 74 ++++++++++++++++++++++---------------------
 debian/python-kombu-doc.docs  |  1 -
 debian/python-kombu-doc.links |  1 -
 debian/rules                  | 10 +++---
 5 files changed, 45 insertions(+), 43 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ccc4c5e..22dce43 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ kombu (4.1.0-1) unstable; urgency=medium
   * Uploading to unstable.
   * Ran wrap-and-sort -bast to minimize diffs.
   * Added myself as uploader.
+  * Correctly builds sphinx doc in override_dh_sphinxdoc, and understand
+    build-profiles nodoc and nocheck..
 
  -- Thomas Goirand <zigo at debian.org>  Sat, 04 Nov 2017 21:45:14 +0000
 
diff --git a/debian/control b/debian/control
index 60f9f78..447ac5a 100644
--- a/debian/control
+++ b/debian/control
@@ -11,46 +11,47 @@ Build-Depends:
  debhelper (>= 9),
  dh-python,
  python-all,
- python-amqp (>= 2.1.4),
- python-anyjson (>= 0.3.3),
- python-beanstalkc,
- python-boto,
- python-case,
- python-couchdb,
- python-django,
- python-funcsigs,
- python-mock,
- python-msgpack,
- python-pika,
- python-pymongo (>= 2.6.2),
- python-pytest,
- python-redis,
  python-setuptools,
- python-simplejson,
- python-sqlalchemy,
- python-tz,
- python-unittest2,
- python-vine,
- python-yaml,
  python3-all,
- python3-amqp (>= 2.1.4),
- python3-anyjson (>= 0.3.3),
- python3-case,
- python3-django,
- python3-funcsigs,
- python3-mock,
- python3-msgpack,
- python3-pymongo,
- python3-pytest,
- python3-redis,
  python3-setuptools,
- python3-simplejson,
  python3-sphinx,
- python3-sphinx-celery,
- python3-sqlalchemy,
- python3-tz,
- python3-vine,
- python3-yaml,
+Build-Depends-Indep:
+ python-amqp (>= 2.1.4) <!nocheck>,
+ python-anyjson (>= 0.3.3) <!nocheck>,
+ python-beanstalkc <!nocheck>,
+ python-boto <!nocheck>,
+ python-case <!nocheck>,
+ python-couchdb <!nocheck>,
+ python-django <!nocheck>,
+ python-funcsigs <!nocheck>,
+ python-mock <!nocheck>,
+ python-msgpack <!nocheck>,
+ python-pika <!nocheck>,
+ python-pymongo (>= 2.6.2) <!nocheck>,
+ python-pytest <!nocheck>,
+ python-redis <!nocheck>,
+ python-simplejson <!nocheck>,
+ python-sqlalchemy <!nocheck>,
+ python-tz <!nocheck>,
+ python-unittest2 <!nocheck>,
+ python-vine <!nocheck>,
+ python-yaml <!nocheck>,
+ python3-amqp (>= 2.1.4) <!nocheck>,
+ python3-anyjson (>= 0.3.3) <!nocheck>,
+ python3-case <!nocheck>,
+ python3-django <!nocheck>,
+ python3-funcsigs <!nocheck>,
+ python3-mock <!nocheck>,
+ python3-msgpack <!nocheck>,
+ python3-pymongo <!nocheck>,
+ python3-pytest <!nocheck>,
+ python3-redis <!nocheck>,
+ python3-simplejson <!nocheck>,
+ python3-sphinx-celery <!nodoc>,
+ python3-sqlalchemy <!nocheck>,
+ python3-tz <!nocheck>,
+ python3-vine <!nocheck>,
+ python3-yaml <!nocheck>,
 Build-Conflicts:
  python-cjson,
  python-sphinx,
@@ -98,6 +99,7 @@ Description: AMQP Messaging Framework for Python
 Package: python-kombu-doc
 Section: doc
 Architecture: all
+Build-Profiles: <!nodoc>
 Depends:
  ${misc:Depends},
  ${sphinxdoc:Depends},
diff --git a/debian/python-kombu-doc.docs b/debian/python-kombu-doc.docs
deleted file mode 100644
index 2981a3c..0000000
--- a/debian/python-kombu-doc.docs
+++ /dev/null
@@ -1 +0,0 @@
-docs/.build/html
diff --git a/debian/python-kombu-doc.links b/debian/python-kombu-doc.links
deleted file mode 100644
index cd4b17c..0000000
--- a/debian/python-kombu-doc.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/doc/python-kombu-doc/html/_sources usr/share/doc/python-kombu-doc/rst
diff --git a/debian/rules b/debian/rules
index 87dbff4..161a0c0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,11 +5,11 @@ export PYBUILD_NAME=kombu
 %:
 	dh $@ --with python2,python3,sphinxdoc --buildsystem=pybuild
 
-override_dh_auto_build: export http_proxy=127.0.0.1:9
-override_dh_auto_build: export https_proxy=127.0.0.1:9
-override_dh_auto_build:
-	PYTHONPATH=. sphinx-build -b html -d docs/.build/.doctrees -N docs docs/.build/html
-	dh_auto_build
+override_dh_sphinxdoc:
+ifeq (,$(findstring nodoc, $(DEB_BUILD_OPTIONS)))
+	http_proxy=127.0.0.1:9 https_proxy=127.0.0.1:9 PYTHONPATH=. sphinx-build -b html -d docs/.build/.doctrees -N docs $(CURDIR)/debian/python-kombu-doc/usr/share/doc/python-kombu-doc/html
+	dh_sphinxdoc
+endif
 
 override_dh_auto_test:
 	dh_auto_test -- --system=custom --test-args="{interpreter} setup.py test"

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