From 5bfe3556b56e4e4539ac82deaed290160078c69e Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Mon, 22 Sep 2014 11:46:09 +0000 Subject: [PATCH] Fixed sphinx doc build. Rewritten-From: 3fa0d27785820ff1ff7d377d522e99d82f5891a3 --- trusty/debian/control | 4 ++-- trusty/debian/heat-common.install | 2 ++ trusty/debian/heat-common.manpages | 3 +++ trusty/debian/rules | 9 ++------- 4 files changed, 9 insertions(+), 9 deletions(-) create mode 100644 trusty/debian/heat-common.manpages diff --git a/trusty/debian/control b/trusty/debian/control index f7b38b99..1e910add 100644 --- 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 52efca1d..e136fea0 100644 --- 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 index 00000000..dbebda97 --- /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 fba49743..e735f264 100755 --- 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 -- 2.45.2