Fixed sphinx doc build.

debian/control

@@ -66,8 +66,8 @@ Build-Depends-Indep: python-babel (>= 1.3),
                      python-troveclient (>= 1.0.4),
                      python-webob (>= 1.2.3),
                      python-yaml,
-                     testrepository (>= 0.0.18),
-                     subunit (>= 0.0.18)
+                     subunit (>= 0.0.18),
+                     testrepository (>= 0.0.18)
 Standards-Version: 3.9.5
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=openstack/heat.git;a=summary
 Vcs-Git: git://anonscm.debian.org/openstack/heat.git

debian/heat-common.install

@@ -1,3 +1,5 @@
+/usr/bin/heat-db-setup
+/usr/bin/heat-keystone-setup
 /usr/bin/heat-manage
 etc/heat/api-paste.ini
 etc/heat/environment.d/default.yaml

debian/heat-common.manpages

@@ -0,0 +1,3 @@
+doc/build/man/heat-db-setup.1
+doc/build/man/heat-keystone-setup.1
+doc/build/man/heat-manage.1

debian/rules

@@ -45,14 +45,9 @@ override_dh_auto_build:
 	/usr/share/openstack-pkg-tools/pkgos_insert_include pkgos_func heat-common.postinst
 	/usr/share/openstack-pkg-tools/pkgos_insert_include pkgos_func heat-common.config
 
-override_dh_installman:
-ifeq (,$(findstring nodocs, $(DEB_BUILD_OPTIONS)))
-	sphinx-build -b man doc/source doc/build/man
-	dh_installman
-endif
-
 override_dh_sphinxdoc:
 ifeq (,$(findstring nodocs, $(DEB_BUILD_OPTIONS)))
-	sphinx-build -b html doc/source $(CURDIR)/debian/heat-doc/usr/share/doc/heat-doc/html
+	python setup.py build_sphinx
+	cp -rf doc/build/html $(CURDIR)/debian/heat-doc/usr/share/doc/heat-doc
 	dh_sphinxdoc -O--buildsystem=python_distutils
 endif