Add horizon-doc

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

Related-Bug: #1460282
Change-Id: I8c039734a5843dd0f6735c61d24dc6edafd1de11

diff --git a/trusty/debian/changelog b/trusty/debian/changelog
index 52adf1d13fbda29afac75fae4402280f465b7c66..a067a93d507abe4a309c4631bab048cf3158df51 100644 (file)
--- a/trusty/debian/changelog
+++ b/trusty/debian/changelog
@@ -1,3 +1,15 @@
+horizon (1:2015.1.0-1~u14.04+mos5) mos7.0; urgency=medium
+
+  * debian/control:
+    - Add horizon-doc package section
+    - Add python-oslosphinx to build dependencies
+  * debian/rules:
+    - Add sphinxdoc to build with
+    - Add override_dh_sphinxdoc section
+  * Add debian/horizon-doc.doc-base
+
+ -- Daniil Trishkin <dtrishkin@mirantis.com>  Fri, 03 Jul 2015 18:13:47 +0300
+
 horizon (1:2015.1.0-1~u14.04+mos4) mos7.0; urgency=medium
 
   * Compile l10n strings at post-install

diff --git a/trusty/debian/control b/trusty/debian/control
index 560e442de106b5064f7c94eb2a81a40528f5a49d..b8ee77473956cfab46e4b99173195ffd4ee5ff44 100644 (file)
--- a/trusty/debian/control
+++ b/trusty/debian/control
@@ -11,9 +11,10 @@ Build-Depends:
  python-mox,
  python-netaddr (>= 0.7.12),
  python-nose,
+ python-oslosphinx (>= 2.5.0),
  python-pbr (>= 0.10),
  python-setuptools,
- python-sphinx
+ python-sphinx (>= 1.1.2)
 Standards-Version: 3.9.3
 Homepage: http://launchpad.net/horizon
 
@@ -104,3 +105,14 @@ Description: django web interface to Openstack
  uses the Django-Nova project to provide web based interactions with the
  OpenStack Nova cloud controller.
 
+Package: horizon-doc
+Architecture: all
+Section: doc
+Pre-Depends: dpkg (>= 1.15.6~)
+Depends: ${misc:Depends}, ${sphinxdoc:Depends}
+Description:
+ The OpenStack Dashboard is a reference implementation of a Django site that
+ uses the Django-Nova project to provide web based interactions with the
+ OpenStack Nova cloud controller.
+ .
+ This package contains the documentation.
\ No newline at end of file

diff --git a/trusty/debian/horizon-doc.doc-base b/trusty/debian/horizon-doc.doc-base
new file mode 100644 (file)
index 0000000..1c93742
--- /dev/null
+++ b/trusty/debian/horizon-doc.doc-base
@@ -0,0 +1,9 @@
+Document: horizon-doc
+Title: Horizon Documentation
+Author: OpenStack
+Abstract: Sphinx documentation for Horizon
+Section: Network/File Transfer
+
+Format: HTML
+Index: /usr/share/doc/horizon-doc/html/index.html
+Files: /usr/share/doc/horizon-doc/html/*
\ No newline at end of file

diff --git a/trusty/debian/rules b/trusty/debian/rules
index 2d9250ee94b0ceac34f5fb1ebd5f1551e02e1c44..031e8a6df5393577ff09ab684bc041d5572c1337 100755 (executable)
--- a/trusty/debian/rules
+++ b/trusty/debian/rules
@@ -4,7 +4,7 @@
 #export DH_VERBOSE=1
 
 %:
-       dh $@  --with python2
+       dh $@  --with python2,sphinxdoc
 
 PYVER=$(shell pyversions -d)
 
@@ -48,3 +48,10 @@ override_dh_auto_test:
        # Skip tests
        :
 endif
+
+override_dh_sphinxdoc:
+ifeq (,$(findstring nodocs, $(DEB_BUILD_OPTIONS)))
+       python setup.py build_sphinx
+       cp -rf doc/build/html $(CURDIR)/debian/horizon-doc/usr/share/doc/horizon-doc
+       dh_sphinxdoc -O--buildsystem=python_distutils
+endif
\ No newline at end of file