[Python-modules-commits] [tox] 15/15: tox 2.2.1

[Barry Warsaw]

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

barry pushed a commit to branch master
in repository tox.

commit 78b831b256f27881a8eb01f6c0e92ed2a90a33c4
Author: Barry Warsaw <barry at ubuntu.com>
Date:   Fri Nov 20 16:44:55 2015 -0500

    tox 2.2.1
    
    * d/patches/fix-sphinx-build.patch: Fix documentation build locations.
    * d/rules: Update override_dh_installdocs locations.
---
 debian/changelog                      | 2 ++
 debian/patches/fix-sphinx-build.patch | 2 ++
 debian/rules                          | 2 +-
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 60a2e49..3ee19e6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 tox (2.2.1-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * d/patches/fix-sphinx-build.patch: Fix documentation build locations.
+  * d/rules: Update override_dh_installdocs locations.
 
  -- Barry Warsaw <barry at debian.org>  Fri, 20 Nov 2015 16:11:39 -0500
 
diff --git a/debian/patches/fix-sphinx-build.patch b/debian/patches/fix-sphinx-build.patch
index 46c0782..e770e8e 100644
--- a/debian/patches/fix-sphinx-build.patch
+++ b/debian/patches/fix-sphinx-build.patch
@@ -3,6 +3,8 @@ From: Barry Warsaw <barry at debian.org>
 Date: Fri, 20 Nov 2015 16:21:55 -0500
 Subject: Fix the source-dir location and move the build target directory up a
  level.
+Bug: https://bitbucket.org/hpk42/tox/issues/289/python3-setuppy-build_sphinx-fails
+Forwarded: no
 
 Patch-Name: fix-sphinx-build.patch
 ---
diff --git a/debian/rules b/debian/rules
index c21cd3a..d9c074d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,7 +16,7 @@ override_dh_auto_test:
 
 override_dh_installdocs:
 	python3 setup.py build_sphinx
-	dh_installdocs build/sphinx/html
+	dh_installdocs build/html
 
 override_dh_installman:
 	(cd debian/manpage; \

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