Added a documentation package with the sphinx docs.

Rewritten-From: 5ef68c6ba6be1278f72ccc7c8076b586e0e11fcf

diff --git a/trusty/debian/ceilometer-doc.doc-base b/trusty/debian/ceilometer-doc.doc-base
new file mode 100644 (file)
index 0000000..49284de
--- /dev/null
+++ b/trusty/debian/ceilometer-doc.doc-base
@@ -0,0 +1,9 @@
+Document: ceilometer-doc
+Title: Ceilometer Documentation
+Author: OpenStack
+Abstract: Sphinx documentation for Ceilometer
+Section: Programming/Python
+
+Format: HTML
+Index: /usr/share/doc/ceilometer-doc/html/index.html
+Files: /usr/share/doc/ceilometer-doc/html/*

diff --git a/trusty/debian/changelog b/trusty/debian/changelog
index 6bb19fe6e27a0af989f076db860e7b1289dc2c97..2780580ed91db8e9cae5a8c0108d79a4b653a4e4 100644 (file)
--- a/trusty/debian/changelog
+++ b/trusty/debian/changelog
@@ -1,3 +1,9 @@
+ceilometer (2015.1.0-4) unstable; urgency=medium
+
+  * Added a documentation package with the sphinx docs.
+
+ -- Thomas Goirand <zigo@debian.org>  Thu, 04 Jun 2015 09:40:08 +0000
+
 ceilometer (2015.1.0-3) unstable; urgency=medium
 
   * Added ceilometer-polling as new package.

diff --git a/trusty/debian/control b/trusty/debian/control
index 08e588e1ce934fbfae8b4e5c3c133205d7c6f2d2..fb0e6d63699831fc52fe49f4391e646e674a21fb 100644 (file)
--- a/trusty/debian/control
+++ b/trusty/debian/control
@@ -317,3 +317,17 @@ Description: OpenStack efficient metering counters system - alarm notifier
  overall system.
  .
  This package contains the alarm notifier daemon.
+
+Package: ceilometer-doc
+Architecture: all
+Depends: ${misc:Depends},
+         ${sphinxdoc:Depends},
+Description: OpenStack efficient metering counters system - doc
+ Ceilometer aims to deliver a Single Point Of Contact for billing systems,
+ providing all the counters they need to establish customer billing, across
+ all current and future OpenStack components. The delivery of counters must be
+ traceable and auditable, the counters must be easily extensible to support new
+ projects, and agents doing data collections should be independent of the
+ overall system.
+ .
+ This package contains the documentation.

diff --git a/trusty/debian/rules b/trusty/debian/rules
index 7de1744dc1b4e7e565ae2c7a0fe661d4ff2895ac..94822756c5c88f21275f6d00faf2bbde67e3b49e 100755 (executable)
--- a/trusty/debian/rules
+++ b/trusty/debian/rules
@@ -7,7 +7,7 @@ include /usr/share/openstack-pkg-tools/pkgos.make
 export OSLO_PACKAGE_VERSION=$(VERSION)
 
 %:
-       dh $@  --with python2,systemd
+       dh $@  --with python2,systemd,sphinxdoc
 
 override_dh_clean:
        dh_clean
@@ -54,3 +54,11 @@ ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
                rm -f $$TEMP_REZ ;
        testr slowest
 endif
+
+override_dh_sphinxdoc:
+ifeq (,$(findstring nodocs, $(DEB_BUILD_OPTIONS)))
+       PYTHONPATH=. sphinx-build -b html doc/source $(CURDIR)/debian/ceilometer-doc/usr/share/doc/ceilometer-doc/html
+       mkdir -p $(CURDIR)/debian/ceilometer-doc/usr/share/doc/ceilometer-doc/html/_static
+       touch $(CURDIR)/debian/ceilometer-doc/usr/share/doc/ceilometer-doc/html/_static/toggle.js
+       dh_sphinxdoc -O--buildsystem=python_distutils
+endif