[Python-modules-commits] [lazr.config] 01/01: Closes: #786516

[Barry Warsaw]

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

barry pushed a commit to branch master
in repository lazr.config.

commit f18d057459086f776aeb74599ca5b1228b41f1a7
Author: Barry Warsaw <barry at ubuntu.com>
Date:   Fri Jun 5 11:03:35 2015 -0400

    Closes: #786516
    
    * d/rules:
      - Added PYBUILD_TEST_NOSE=1 to invoke the correct test runner.
      - Add override_dh_sphinxdoc as a hack to prevent .pybuild directories
        from leaking into the python-lazr.config-doc package.  (Closes: #786516)
---
 debian/changelog |  5 ++++-
 debian/rules     | 13 +++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index d3374a3..9fd75df 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,10 @@ lazr.config (2.1-1) UNRELEASED; urgency=medium
 
   * New upstream release.
   * d/control: Bumped Standards-Version to 3.9.6 with no other changes needed.
-  * d/rules: Added PYBUILD_TEST_NOSE=1 to invoke the correct test runner.
+  * d/rules:
+    - Added PYBUILD_TEST_NOSE=1 to invoke the correct test runner.
+    - Add override_dh_sphinxdoc as a hack to prevent .pybuild directories
+      from leaking into the python-lazr.config-doc package.  (Closes: #786516)
   * d/README.source: Fix typo.
   * d/copyright: Fix typo.
   * d/watch: Use the new pypi.debian.net redirector url.
diff --git a/debian/rules b/debian/rules
index 84565d4..a1c158e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,3 +10,16 @@ export PYBUILD_TEST_NOSE=1
 override_dh_installdocs:
 	python setup.py build_sphinx
 	dh_installdocs
+
+# 2015-06-05 barry at debian.org.  It's not clear to me why we have to find and
+# nuke the (several) .pybuild directories from the python-lazr.config-doc
+# package.  I would have expected pybuild and/or dh_sphinxdoc or some other
+# infrastructure to prevent those from leaking into the package.  Or I'd have
+# expected `dh_sphinxdoc -X.pybuild` to do the trick.  None of that worked for
+# me (the latter caused a FTBFS).  When there's time it would be worth
+# tracking down, but in the meantime, this is the most expedient way to fix
+# bug #786516.
+
+override_dh_sphinxdoc:
+	dh_sphinxdoc
+	find debian/python-lazr.config-doc -name .pybuild | xargs rm -rf

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