* Added a horizon-doc package.

  * Fixed debian/rules dpkg-parsechangelog to be compatible with Ubuntu.

Rewritten-From: 9ef103b880e4130488ff3ee84ce71330734e61f1

diff --git a/trusty/debian/changelog b/trusty/debian/changelog
index 7f8fc5d6ce3db181f0df062da09a51247241963b..7bd1bf76cb99fb9862d71f84e9536b4c817f22c8 100644 (file)
--- a/trusty/debian/changelog
+++ b/trusty/debian/changelog
@@ -1,3 +1,10 @@
+horizon (2:8.0.0~b3-6) experimental; urgency=medium
+
+  * Added a horizon-doc package.
+  * Fixed debian/rules dpkg-parsechangelog to be compatible with Ubuntu.
+
+ -- Thomas Goirand <zigo@debian.org>  Wed, 23 Sep 2015 08:50:12 +0200
+
 horizon (2:8.0.0~b3-5) experimental; urgency=medium
 
   * Increasing EPOCH to match the one of Ubuntu.

diff --git a/trusty/debian/control b/trusty/debian/control
index 908cdff825ce9b78543256502fecc4a2b9b2d6b7..13f561393ded471749a9febe2704e43409f0d4fb 100644 (file)
--- a/trusty/debian/control
+++ b/trusty/debian/control
@@ -184,7 +184,7 @@ Depends: debconf,
          libapache2-mod-wsgi (>= 2.3),
          openstack-dashboard,
          ${misc:Depends},
-Description: OpenStack Dashboard - Apache support
+Description: web application to control an OpenStack cloud - Apache support
  The OpenStack Dashboard is a web application to control an OpenStack
  cloud. It connects to OpenStack services such as Nova, Swift, or Keystone
  using the OpenStack REST API just as you would with the command line
@@ -192,3 +192,16 @@ Description: OpenStack Dashboard - Apache support
  .
  This package includes the configuration files to use within Apache. If you
  wish to configure Apache yourself, use only openstack-dashboard.
+
+Package: horizon-doc
+Section: doc
+Architecture: all
+Depends: ${misc:Depends},
+         ${sphinxdoc:Depends},
+Description: web application to control an OpenStack cloud - doc
+ The OpenStack Dashboard is a web application to control an OpenStack
+ cloud. It connects to OpenStack services such as Nova, Swift, or Keystone
+ using the OpenStack REST API just as you would with the command line
+ clients.
+ .
+ This package contains the documentation.

diff --git a/trusty/debian/rules b/trusty/debian/rules
index b5a4d5c3f8e680099b8facdd66cee89c3dd70bec..c3d2cb4c80b17b43e66202b97453abf440b5c9fa 100755 (executable)
--- a/trusty/debian/rules
+++ b/trusty/debian/rules
@@ -3,10 +3,10 @@
 PYTHONS:=$(shell pyversions -vr)
 
 include /usr/share/openstack-pkg-tools/pkgos.make
-export OSLO_PACKAGE_VERSION=$(shell dpkg-parsechangelog -S Version | sed -e 's/^[[:digit:]]*://' -e 's/[-].*//' -e 's/~/.0/')
+export OSLO_PACKAGE_VERSION=$(shell dpkg-parsechangelog | grep Version: | cut -d' ' -f2 | sed -e 's/^[[:digit:]]*://' -e 's/[-].*//' -e 's/~/.0/' | head -n 1)
 
 %:
-       dh $@ --with python2
+       dh $@ --buildsystem=python_distutils --with python2,sphinxdoc
 
 override_dh_auto_install:
        # Note: upstream advises to use "python setup.py compile_catalog"
@@ -59,6 +59,12 @@ override_dh_auto_clean:
        rm -f horizon/openstack_dashboard/test/.secret_key_store
        find $(CURDIR)/openstack_dashboard -iname '*.pyc' -delete
 
+override_dh_sphinxdoc:
+ifeq (,$(findstring nodocs, $(DEB_BUILD_OPTIONS)))
+       sphinx-build -b html doc/source debian/horizon-doc/usr/share/doc/horizon-doc/html
+       dh_sphinxdoc -O--buildsystem=python_distutils
+endif
+
 ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
 override_dh_auto_test:
        # We should add --compilemessages when the .mo are removed.