Added missing (conditional) lsb-base depends.

Rewritten-From: b42eba1df1a192779d64be122a937aefe9bdf2ff

diff --git a/xenial/debian/control b/xenial/debian/control
index 695c609d9a436812f880e26f5b7af1876a5a1869..a2ed3dc89711c7b840dfa13a56fd443641cc36c2 100644 (file)
--- a/xenial/debian/control
+++ b/xenial/debian/control
@@ -99,7 +99,7 @@ Description: Openstack block storage as a service - common files
 Package: cinder-api
 Architecture: all
 Pre-Depends: dpkg (>= 1.15.6~)
-Depends: debconf, cinder-common (= ${binary:Version}), ${python:Depends}, ${misc:Depends}, python-keystoneclient
+Depends: ${ostack-lsb-base}, debconf, cinder-common (= ${binary:Version}), ${python:Depends}, ${misc:Depends}, python-keystoneclient
 Description: Openstack block storage as a service - API server
  Cinder is a block storage as service system for the Openstack cloud computing
  software suite. It is a direct replacement for nova-volume as a separate
@@ -112,7 +112,7 @@ Description: Openstack block storage as a service - API server
 Package: cinder-volume
 Architecture: all
 Pre-Depends: dpkg (>= 1.15.6~)
-Depends: cinder-common (= ${binary:Version}), ${python:Depends}, ${misc:Depends}
+Depends: ${ostack-lsb-base}, cinder-common (= ${binary:Version}), ${python:Depends}, ${misc:Depends}
 Description: Openstack block storage as a service - Volume server
  Cinder is a block storage as service system for the Openstack cloud computing
  software suite. It is a direct replacement for nova-volume as a separate
@@ -125,7 +125,7 @@ Description: Openstack block storage as a service - Volume server
 Package: cinder-scheduler
 Architecture: all
 Pre-Depends: dpkg (>= 1.15.6~)
-Depends: cinder-common (= ${binary:Version}), ${python:Depends}, ${misc:Depends}
+Depends: ${ostack-lsb-base}, cinder-common (= ${binary:Version}), ${python:Depends}, ${misc:Depends}
 Description: Openstack block storage as a service - Scheduler server
  Cinder is a block storage as service system for the Openstack cloud computing
  software suite. It is a direct replacement for nova-volume as a separate

diff --git a/xenial/debian/debian_control_vars b/xenial/debian/debian_control_vars
new file mode 100644 (file)
index 0000000..e736811
--- /dev/null
+++ b/xenial/debian/debian_control_vars
@@ -0,0 +1 @@
+ostack-lsb-base= lsb-base  (>= 3.0-6)

diff --git a/xenial/debian/ubuntu_control_vars b/xenial/debian/ubuntu_control_vars
new file mode 100644 (file)
index 0000000..e69de29