Fix double [DEFAULT] within config generation

[openstack-build/cinder-build.git] / trusty / debian / control

diff --git a/trusty/debian/control b/trusty/debian/control
index fb34313b123c99093c38835be47ff3dd2f3e8bac..0fa58ea35d2595899e0c5e48e26b07c3eb533624 100644 (file)
--- a/trusty/debian/control
+++ b/trusty/debian/control
@@ -5,8 +5,12 @@ Maintainer: MOS Cinder Team <mos-cinder@mirantis.com>
 Build-Depends:
  debhelper (>= 9),
  dh-systemd,
+ dh-python,
  openstack-pkg-tools (>= 21),
- python-all (>= 2.7.1)
+ python-all (>= 2.7.1),
+ python-pbr (>= 0.10),
+ python-setuptools,
+ python-sphinx (>= 1.1.2)
 Build-Depends-Indep:
  python-anyjson (>= 0.3.3),
  python-babel (>= 1.3),
@@ -29,25 +33,24 @@ Build-Depends-Indep:
  python-mysqldb,
  python-netaddr (>= 0.7.12),
  python-novaclient (>= 1:2.22.0),
- python-oslo-concurrency (>= 1.8.0),
- python-oslo-config (>= 1:1.9.3),
- python-oslo-context (>= 0.2.0),
- python-oslo-db (>= 1.7.0),
- python-oslo-i18n (>= 1.5.0),
- python-oslo-log (>= 1.0.0),
- python-oslo-messaging (>= 1.8.0),
- python-oslo-middleware (>= 1.0.0),
- python-oslo-rootwrap (>= 1.6.0),
- python-oslo-serialization (>= 1.4.0),
- python-oslo-utils (>= 1.4.0),
- python-oslo-vmware (>= 0.11.1),
+ python-oslo.concurrency (>= 1.8.0),
+ python-oslo.config (>= 1:1.9.3),
+ python-oslo.context (>= 0.2.0),
+ python-oslo.db (>= 1.7.0),
+ python-oslo.i18n (>= 1.5.0),
+ python-oslo.log (>= 1.0.0),
+ python-oslo.messaging (>= 1.8.0),
+ python-oslo.middleware (>= 1.0.0),
+ python-oslo.rootwrap (>= 1.6.0),
+ python-oslo.serialization (>= 1.4.0),
+ python-oslo.utils (>= 1.4.0),
+ python-oslo.vmware (>= 0.11.1),
  python-oslosphinx (>= 2.5.0),
  python-oslotest (>= 1.5.1),
  python-osprofiler (>= 0.3.0),
  python-paramiko (>= 1.13.0),
  python-paste,
  python-pastedeploy (>= 1.5.0),
- python-pbr (>= 0.10),
  python-psycopg2,
  python-pyparsing (>= 2.0.1),
  python-requests (>= 2.2.0),
@@ -55,7 +58,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),
@@ -79,31 +81,32 @@ Depends:
  python-anyjson (>= 0.3.3),
  python-babel (>= 1.3),
  python-barbicanclient (>= 3.0.1),
+ python-ceph,
  python-crypto (>= 2.6),
  python-eventlet (>= 0.16.1),
  python-glanceclient (>= 1:0.15.0),
  python-greenlet (>= 0.3.2),
+ python-hp3parclient,
  python-iso8601 (>= 0.1.9),
  python-keystoneclient (>= 1:1.1.0),
  python-keystonemiddleware (>= 1.5.0),
  python-kombu (>= 2.5.0),
- python-lockfile (>= 0.8),
  python-lxml (>= 2.3),
  python-migrate (>= 0.9.5),
  python-netaddr (>= 0.7.12),
  python-novaclient (>= 1:2.22.0),
- python-oslo-concurrency (>= 1.8.0),
- python-oslo-config (>= 1:1.9.3),
- python-oslo-context (>= 0.2.0),
- python-oslo-db (>= 1.7.0),
- python-oslo-i18n (>= 1.5.0),
- python-oslo-log (>= 1.0.0),
- python-oslo-messaging (>= 1.8.0),
- python-oslo-middleware (>= 1.0.0),
- python-oslo-rootwrap (>= 1.6.0),
- python-oslo-serialization (>= 1.4.0),
- python-oslo-utils (>= 1.4.0),
- python-oslo-vmware (>= 0.11.1),
+ python-oslo.concurrency (>= 1.8.0),
+ python-oslo.config (>= 1:1.9.3),
+ python-oslo.context (>= 0.2.0),
+ python-oslo.db (>= 1.7.0),
+ python-oslo.i18n (>= 1.5.0),
+ python-oslo.log (>= 1.0.0),
+ python-oslo.messaging (>= 1.8.0),
+ python-oslo.middleware (>= 1.0.0),
+ python-oslo.rootwrap (>= 1.6.0),
+ python-oslo.serialization (>= 1.4.0),
+ python-oslo.utils (>= 1.4.0),
+ python-oslo.vmware (>= 0.11.1),
  python-osprofiler (>= 0.3.0),
  python-paramiko (>= 1.13.0),
  python-paste,
@@ -113,6 +116,7 @@ Depends:
  python-requests (>= 2.2.0),
  python-retrying (>= 1.2.3),
  python-routes (>= 1.12.3),
+ python-rtslib-fb,
  python-six (>= 1.9.0),
  python-sqlalchemy (>= 0.9.7),
  python-stevedore (>= 1.3.0),
@@ -122,7 +126,6 @@ Depends:
  python-webob (>= 1.2.3),
  ${misc:Depends},
  ${python:Depends}
-Suggests: python-ceph, python-hp3parclient, python-rtslib-fb
 Description: Cinder Python libraries
  OpenStack is a reliable cloud infrastructure. Its mission is to produce
  the ubiquitous cloud computing platform that will meet the needs of public
@@ -219,3 +222,17 @@ Description: Cinder storage service - Scheduler server
  Cinder is the OpenStack Block storage service.
  .
  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