Now building the doc in a heat-doc package.

Rewritten-From: a8dcce6bdb6292ba71415c45e16ec37c70bfa7e9

diff --git a/trusty/debian/changelog b/trusty/debian/changelog
index c1d2666b7b82e8c9ddce0d144c39ba82620550a8..86c847f52b687c24d5a1eb82117b1e320d0156d1 100644 (file)
--- a/trusty/debian/changelog
+++ b/trusty/debian/changelog
@@ -2,6 +2,7 @@ heat (2014.1~b2-1) experimental; urgency=low
 
   * New upstream release (Icehouse beta 1).
   * Added new (build)-depends python-heatclient (>= 0.2.3).
+  * Now building the sphinx doc in a heat-doc package.
 
  -- Thomas Goirand <zigo@debian.org>  Mon, 09 Dec 2013 22:01:07 +0800
 

diff --git a/trusty/debian/control b/trusty/debian/control
index f06039abdc44a60a2e2cede6994cef973d83f50d..3a3f9328540f16ea0dfbff69a840d9c46dd04f20 100644 (file)
--- a/trusty/debian/control
+++ b/trusty/debian/control
@@ -191,3 +191,15 @@ Description: OpenStack orchestration service - CloudWatch API
  CloudFormation-compatible Query API.
  .
  This package contains the CloudWatch API.
+
+Package: heat-doc
+Architecture: all
+Section: doc
+Pre-Depends: dpkg (>= 1.15.6~)
+Depends: ${misc:Depends}, ${sphinxdoc:Depends}
+Description: OpenStack orchestration service - Documentation
+ Heat is a service to orchestrate multiple composite cloud applications using
+ templates, through both an OpenStack-native ReST API and a
+ CloudFormation-compatible Query API.
+ .
+ This package contains the documentation.

diff --git a/trusty/debian/heat-doc.doc-base b/trusty/debian/heat-doc.doc-base
new file mode 100644 (file)
index 0000000..014b206
--- /dev/null
+++ b/trusty/debian/heat-doc.doc-base
@@ -0,0 +1,9 @@
+Document: heat-doc
+Title: Heat Documentation
+Author: OpenStack
+Abstract: Sphinx documentation for Heat
+Section: Network/File Transfer
+
+Format: HTML
+Index: /usr/share/doc/heat-doc/html/index.html
+Files: /usr/share/doc/heat-doc/html/*

diff --git a/trusty/debian/rules b/trusty/debian/rules
index 014414386993bb04490ea85c73e5bf3bf7931b85..e504c40e02454241e19d2e0107d640ed5ee5f60e 100755 (executable)
--- a/trusty/debian/rules
+++ b/trusty/debian/rules
@@ -4,7 +4,7 @@ include /usr/share/openstack-pkg-tools/pkgos.make
 export OSLO_PACKAGE_VERSION=$(VERSION)
 
 %:
-       dh $@  --with python2
+       dh $@ --buildsystem=python_distutils --with python2,sphinxdoc
 
 ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
 override_dh_auto_test:
@@ -32,6 +32,13 @@ override_dh_auto_build:
        /usr/share/openstack-pkg-tools/pkgos_insert_include pkgos_func heat-common.config
 
 override_dh_installman:
-       python setup.py build
-       make -C doc man
+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
+       dh_sphinxdoc -O--buildsystem=python_distutils
+endif