Add doc package for cinder

* debian/control:
    - Add cinder-doc package section
    - Add python-sphinx and python-oslosphinx
      to build dependencies
  * debian/rules:
    - Add sphinxdoc to build with
    - Add override_dh_sphinxdoc section
  * Remove debian/docs

Related-Bug: #1460282
Change-Id: I99948e60499800a63df9dd2e4ca5d7b07fdb7af8

diff --git a/trusty/debian/changelog b/trusty/debian/changelog
index 51c4ba31c00573e4bc3e81175bf59dd8c8a2bdcd..79c7a74cc73cb38adba79282867553e544750a22 100644 (file)
--- a/trusty/debian/changelog
+++ b/trusty/debian/changelog
@@ -1,3 +1,16 @@
+cinder (1:2015.1.0-1~u14.04+mos5) mos7.0; urgency=medium
+
+  * debian/control:
+    - Add cinder-doc package section
+    - Add python-sphinx and python-oslosphinx
+      to build dependencies
+  * debian/rules:
+    - Add sphinxdoc to build with
+    - Add override_dh_sphinxdoc section
+  * Remove debian/docs
+
+ -- Michael Ivanov <mivanov@mirantis.net>  Wed, 24 Jun 2015 13:27:58 +0300
+
 cinder (1:2015.1.0-1~u14.04+mos4) mos7.0; urgency=medium
 
   * Remove ger-orig-source from rules

diff --git a/trusty/debian/control b/trusty/debian/control
index 7b831a8dfd34511663ffc69644ee56346370e16f..3a5f9a683a7814b2f1564a5efcf8364dff576842 100644 (file)
--- a/trusty/debian/control
+++ b/trusty/debian/control
@@ -6,7 +6,8 @@ Build-Depends:
  debhelper (>= 9),
  dh-systemd,
  openstack-pkg-tools (>= 21),
- python-all (>= 2.7.1)
+ python-all (>= 2.7.1),
+ python-sphinx (>= 1.1.2)
 Build-Depends-Indep:
  python-anyjson (>= 0.3.3),
  python-babel (>= 1.3),
@@ -55,7 +56,6 @@ Build-Depends-Indep:
  python-routes (>= 1.12.3),
  python-setuptools,
  python-six (>= 1.9.0),
- python-sphinx (>= 1.1.2),
  python-sqlalchemy (>= 0.9.7),
  python-stevedore (>= 1.3.0),
  python-subunit (>= 0.0.18),
@@ -218,4 +218,18 @@ Description: Cinder storage service - Scheduler server
  .
  Cinder is the OpenStack Block storage service.
  .
- This package contains the Cinder backup service.
\ No newline at end of file
+ This package contains the Cinder backup service.
+
+Package: cinder-doc
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}, ${sphinxdoc:Depends}
+Description: Cinder storage service - Scheduler server
+ OpenStack is a reliable cloud infrastructure. Its mission is to produce
+ the ubiquitous cloud computing platform that will meet the needs of public
+ and private cloud providers regardless of size, by being simple to implement
+ and massively scalable.
+ .
+ Cinder is the OpenStack Block storage service.
+ .
+ This package contains the documentation

diff --git a/trusty/debian/docs b/trusty/debian/docs
deleted file mode 100644 (file)
index a1320b1..0000000
--- a/trusty/debian/docs
+++ /dev/null
@@ -1 +0,0 @@
-README.rst

diff --git a/trusty/debian/rules b/trusty/debian/rules
index 11b7a6a34f20263c0465114c6a8b46044cd6fc00..2222f4f2b8abc7efd4d9e63d6a6058a2deb55ea7 100755 (executable)
--- a/trusty/debian/rules
+++ b/trusty/debian/rules
@@ -6,7 +6,7 @@
 include /usr/share/openstack-pkg-tools/pkgos.make
 
 %:
-       dh $@  --with python2,systemd
+       dh $@  --with python2,systemd,sphinxdoc
 
 ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
 override_dh_auto_test:
@@ -28,3 +28,10 @@ override_dh_clean:
        # temporary workaround for d2to1 wonkyness
        dh_clean -Xsetup.cfg
        rm -f debian/*.init debian/*.service debian/*.upstart
+
+override_dh_sphinxdoc:
+ifeq (,$(findstring nodocs, $(DEB_BUILD_OPTIONS)))
+       python setup.py build_sphinx
+       cp -rf doc/build/html $(CURDIR)/debian/cinder-doc/usr/share/doc/cinder-doc
+       dh_sphinxdoc -O--buildsystem=python_distutils
+endif