From 18d4877b7040ed37f4a1474084d3f4e05bf23ada Mon Sep 17 00:00:00 2001 From: dtrishkin Date: Fri, 3 Jul 2015 18:02:13 +0300 Subject: [PATCH] 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 --- trusty/debian/changelog | 12 ++++++++++++ trusty/debian/control | 14 +++++++++++++- trusty/debian/horizon-doc.doc-base | 9 +++++++++ trusty/debian/rules | 9 ++++++++- 4 files changed, 42 insertions(+), 2 deletions(-) create mode 100644 trusty/debian/horizon-doc.doc-base diff --git a/trusty/debian/changelog b/trusty/debian/changelog index 52adf1d..a067a93 100644 --- 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 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 560e442..b8ee774 100644 --- 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 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 2d9250e..031e8a6 100755 --- 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 -- 2.45.2