Add heat-doc package

  * debian/control:
    - Add heat-doc package section
    - Add python-oslo.versionedobjects to build dependencies
  * debian/rules:
    - Add sphinxdoc to build with
    - Add override_dh_sphinxdoc section
  * Add debian/heat-doc.doc-base

Change-Id: Ia986438c389fef9309e2a011bd1147a1e00ea7a1
Related-Bug: #1460282

diff --git a/trusty/debian/changelog b/trusty/debian/changelog
index 588f4bdc38ce937697bf60313f9399dcf604f0d1..5a64efb3aedf1e46c5542c35c9beef7db995b200 100644 (file)
--- a/trusty/debian/changelog
+++ b/trusty/debian/changelog
@@ -1,3 +1,15 @@
+heat (2015.1.0-1~u14.04+mos4) mos7.0; urgency=medium
+
+  * debian/control:
+    - Add heat-doc package section
+    - Add python-oslo.versionedobjects to build dependencies
+  * debian/rules:
+    - Add sphinxdoc to build with
+    - Add override_dh_sphinxdoc section
+  * Add debian/heat-doc.doc-base
+
+ -- Daniil Trishkin <dtrishkin@mirantis.com>  Fri, 19 Jun 2015 16:25:42 +0300
+
 heat (2015.1.0-1~u14.04+mos3) mos7.0; urgency=medium
 
  * Add missing binaries (LP #1468309)

diff --git a/trusty/debian/control b/trusty/debian/control
index 00f46da98959998be584ea671188ae7d2f51c54a..fa63cdc9ab8288ec7f5c31a939127e2afdfa5ff5 100644 (file)
--- a/trusty/debian/control
+++ b/trusty/debian/control
@@ -8,6 +8,7 @@ Build-Depends:
  openstack-pkg-tools (>= 21),
  python-all (>= 2.7.1),
  python-pbr (>= 0.10),
+ python-sphinx (>= 1.1.2)
 Build-Depends-Indep:
  python-alembic,
  python-babel (>= 1.3),
@@ -48,6 +49,7 @@ Build-Depends-Indep:
  python-oslo.serialization (>= 1.4.0),
  python-oslo.utils (>= 1.4.0),
  python-oslosphinx (>= 2.5.0),
+ python-oslo.versionedobjects (>=0.1.1),
  python-oslotest (>= 1.5.1),
  python-osprofiler (>= 0.3.0),
  python-paramiko (>= 1.13.0),
@@ -60,7 +62,6 @@ Build-Depends-Indep:
  python-saharaclient (>= 0.8.0),
  python-setuptools,
  python-six (>= 1.9.0),
- python-sphinx (>= 1.1.2),
  python-sqlalchemy (>= 0.9.7),
  python-stevedore (>= 1.3.0),
  python-swiftclient (>= 1:2.2.0),
@@ -242,3 +243,14 @@ Description: OpenStack orchestration service - common files
  .
  This package contains the common files.
 
+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.
\ No newline at end of file

diff --git a/trusty/debian/heat-doc.doc-base b/trusty/debian/heat-doc.doc-base
new file mode 100644 (file)
index 0000000..59896d3
--- /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/*
\ No newline at end of file

diff --git a/trusty/debian/rules b/trusty/debian/rules
index 3c78887170cd5f7599f9c37a6c6b480aeec337d4..226d05bc09fda190ea05ed52e2c839ea72b357d6 100755 (executable)
--- a/trusty/debian/rules
+++ b/trusty/debian/rules
@@ -5,7 +5,7 @@
 include /usr/share/openstack-pkg-tools/pkgos.make
 
 %:
-       dh $@ --buildsystem=python_distutils --with python2,systemd
+       dh $@ --buildsystem=python_distutils --with python2,systemd,sphinxdoc
 
 #ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
 #override_dh_auto_test:
@@ -36,3 +36,10 @@ override_dh_install:
 #      python setup.py build
 #      make -C doc man
 #      dh_installman
+
+override_dh_sphinxdoc:
+ifeq (,$(findstring nodocs, $(DEB_BUILD_OPTIONS)))
+       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
\ No newline at end of file