Fixed sphinx doc build.

Rewritten-From: 3fa0d27785820ff1ff7d377d522e99d82f5891a3

diff --git a/trusty/debian/control b/trusty/debian/control
index f7b38b99d9446dff623aa68d130b24dee9bb1298..1e910add425e29253cdcf0f9554a7ad3a2a91b43 100644 (file)
--- a/trusty/debian/control
+++ b/trusty/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

diff --git a/trusty/debian/heat-common.install b/trusty/debian/heat-common.install
index 52efca1d2fe303d806bc6a06598029d824c48489..e136fea0a50948d7adf22cb4cb96bde1f9b6f15b 100644 (file)
--- a/trusty/debian/heat-common.install
+++ b/trusty/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

diff --git a/trusty/debian/heat-common.manpages b/trusty/debian/heat-common.manpages
new file mode 100644 (file)
index 0000000..dbebda9
--- /dev/null
+++ b/trusty/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

diff --git a/trusty/debian/rules b/trusty/debian/rules
index fba49743707e833e21dd7eefabd18ef5634acd15..e735f264ba8ef7501213cca4df6f2a4bb0bc2d91 100755 (executable)
--- a/trusty/debian/rules
+++ b/trusty/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