[Python-modules-commits] [python-amqp] 07/07: * Building sphinx doc directly within the destination folder: $(CURDIR)/debian/python-amqp-doc/usr/share/doc/python-amqp-doc/html

[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 9f7495554376a1afcad946065bca6f89b39aaee4
Author: Thomas Goirand <zigo at debian.org>
Date:   Sat Nov 4 21:21:43 2017 +0000

      * Building sphinx doc directly within the destination folder:
        $(CURDIR)/debian/python-amqp-doc/usr/share/doc/python-amqp-doc/html
---
 debian/changelog             | 2 ++
 debian/python-amqp-doc.docs  | 1 -
 debian/python-amqp-doc.links | 1 -
 debian/rules                 | 3 +--
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d0461c9..e0bfc1d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ python-amqp (2.2.1-1) unstable; urgency=medium
   * Properly building docs from override_dh_sphinxdoc and respecting
     DEB_BUILD_OPTIONS=nodoc, plus handling build profiles (also with nocheck).
   * Deprecating priority extra as per policy 4.0.1.
+  * Building sphinx doc directly within the destination folder:
+    $(CURDIR)/debian/python-amqp-doc/usr/share/doc/python-amqp-doc/html
 
  -- Thomas Goirand <zigo at debian.org>  Sat, 04 Nov 2017 20:57:21 +0000
 
diff --git a/debian/python-amqp-doc.docs b/debian/python-amqp-doc.docs
deleted file mode 100644
index 2981a3c..0000000
--- a/debian/python-amqp-doc.docs
+++ /dev/null
@@ -1 +0,0 @@
-docs/.build/html
diff --git a/debian/python-amqp-doc.links b/debian/python-amqp-doc.links
deleted file mode 100644
index 8b8c682..0000000
--- a/debian/python-amqp-doc.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/doc/python-amqp-doc/html/_sources usr/share/doc/python-amqp-doc/rst
diff --git a/debian/rules b/debian/rules
index 9e26d56..282e71b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,7 +15,7 @@ export PYBUILD_AFTER_TEST=rm -rf {build_dir}/t
 
 override_dh_sphinxdoc:
 ifeq (,$(findstring nodoc, $(DEB_BUILD_OPTIONS)))
-	PYTHONPATH=. sphinx-build -D today="$(BUILD_DATE)" -b html -N docs/ docs/.build/html
+	PYTHONPATH=. sphinx-build -D today="$(BUILD_DATE)" -b html -N docs/ $(CURDIR)/debian/python-amqp-doc/usr/share/doc/python-amqp-doc/html
 	dh_sphinxdoc
 endif
 
@@ -25,4 +25,3 @@ override_dh_clean:
 
 override_dh_installchangelogs:
 	dh_installchangelogs docs/changelog.rst
-

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