Added doc package for Neutron

* debian/control:
    - Add neutron-doc package section
    - Add python-sphinx to build dependencies
* debian/rules:
    - Add sphinxdoc to build with
    - Add override_dh_sphinxdoc section

Related-Bug: #1460282
Change-Id: I978241db7e0ee9aea0b3d4e85e7e248fbc5fd179

diff --git a/trusty/debian/changelog b/trusty/debian/changelog
index 2b0d5bded4e0acec7093183c98232fc78f773613..c3da7e059c146646232c31560b1717a7393299d8 100644 (file)
--- a/trusty/debian/changelog
+++ b/trusty/debian/changelog
@@ -1,3 +1,14 @@
+neutron (1:2015.1.0-1~u14.04+mos5) mos7.0; urgency=medium
+
+  * debian/control:
+    - Add neutron-doc package section
+    - Add python-sphinx to build dependencies
+  * debian/rules:
+    - Add sphinxdoc to build with
+    - Add override_dh_sphinxdoc section
+
+ -- Sergey Kolekonov <skolekonov@mirantis.com>  Thu, 09 Jul 2015 15:35:48 +0300
+
 neutron (1:2015.1.0-1~u14.04+mos4) mos7.0; urgency=medium
 
   * python-neutron-fwaas was removed to avoid cross-dependency conflict when

diff --git a/trusty/debian/control b/trusty/debian/control
index 428a24443c9e787e00f1f7223580a8683e10e9ae..cdf0571b95f51a855c06565cad9977a46e37d52e 100644 (file)
--- a/trusty/debian/control
+++ b/trusty/debian/control
@@ -2,7 +2,7 @@ Source: neutron
 Section: net
 Priority: optional
 Maintainer: MOS Neutron Team <mos-neutron@mirantis.com>
-Build-Depends: debhelper (>= 9), python-all (>= 2.7.1)
+Build-Depends: debhelper (>= 9), python-all (>= 2.7.1), python-sphinx (>= 1.1.2)
 Build-Depends-Indep:
  alembic (>= 0.7.2),
  python-anyjson (>= 0.3.3),
@@ -786,3 +786,19 @@ Description: Neutron is a virtual network service for Openstack - OpenContrail p
  etc.)
  .
  This package provides the OpenContail plugin.
+
+Package: neutron-doc
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}, ${sphinxdoc:Depends}
+Description: Neutron is a virtual network service for Openstack - Docs
+ Neutron is a virtual network service for Openstack, and a part of
+ Netstack. Just like OpenStack Nova provides an API to dynamically
+ request and configure virtual servers, Neutron provides an API to
+ dynamically request and configure virtual networks. These networks
+ connect "interfaces" from other OpenStack services (e.g., virtual NICs
+ from Nova VMs). The Neutron API supports extensions to provide
+ advanced network capabilities (e.g., QoS, ACLs, network monitoring,
+ etc.)
+ .
+ This package contains the documentation

diff --git a/trusty/debian/rules b/trusty/debian/rules
index 748eaad56f19aeb7dadeee14f866506128ea2d19..3712a678badabdc0f9c7667d7eba8a031c00c2a3 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
 
 override_dh_install:
        dh_install --fail-missing -X/usr/etc -X/usr/bin/neutron-hyperv-agent
@@ -27,3 +27,9 @@ ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
        patch -p1 < debian/patches/fix-neutron-configuration.patch
 endif
 
+override_dh_sphinxdoc:
+ifeq (,$(findstring nodocs, $(DEB_BUILD_OPTIONS)))
+        python setup.py build_sphinx
+        cp -rf doc/build/html $(CURDIR)/debian/neutron-doc/usr/share/doc/neutron-doc
+        dh_sphinxdoc -O--buildsystem=python_distutils
+endif