[Python-modules-commits] [python-conditional] 03/03: setuptools + build&install doc properly

[Sandro Tosi]

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

morph pushed a commit to branch master
in repository python-conditional.

commit 005ee974a6b7777fa4fdf6bb718a0ac124dd0f16
Author: Sandro Tosi <morph at debian.org>
Date:   Tue Jun 30 18:00:23 2015 -0400

    setuptools + build&install doc properly
---
 debian/control | 2 +-
 debian/rules   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/control b/debian/control
index 0efd069..ca127dd 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: python
 Priority: optional
 Maintainer: Sandro Tosi <morph at debian.org>
 Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 9), python, python3, dh-python, python-sphinx
+Build-Depends: debhelper (>= 9), python, python3, dh-python, python-sphinx, python-setuptools, python3-setuptools
 Standards-Version: 3.9.6
 Homepage: https://github.com/stefanholek/conditional
 Vcs-Git: git://anonscm.debian.org/python-modules/packages/python-conditional.git
diff --git a/debian/rules b/debian/rules
index 17062d8..c9e434d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,11 +5,11 @@
 
 override_dh_auto_build:
 	dh_auto_build
-	$(MAKE) -C docs html
+	$(MAKE) -C docs html SPHINXBUILD=sphinx-build
 
 override_dh_auto_install:
 	python  setup.py install --install-layout=deb --root=$(CURDIR)/debian/python-conditional
 	python3 setup.py install --install-layout=deb --root=$(CURDIR)/debian/python3-conditional
 
 override_dh_installdocs:
-	dh_installdocs -ppython-conditional-doc docs/build/html
+	dh_installdocs -ppython-conditional-doc docs/_build/html

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