Fix building rules for Neutron

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

diff --git a/trusty/debian/control b/trusty/debian/control
index e4dd99d3bfb492a2f32b31ce12e54973a2df8e78..6f54a91a6a2b6ee3c618c4da01670a388576d833 100644 (file)
--- a/trusty/debian/control
+++ b/trusty/debian/control
@@ -23,17 +23,17 @@ Build-Depends-Indep:
  python-netaddr (>= 0.7.12),
  python-neutronclient (>= 1:2.3.11),
  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.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-oslosphinx (>= 2.5.0),
  python-oslotest (>= 1.5.1),
  python-paste,
@@ -87,7 +87,7 @@ Architecture: all
 Depends:
  adduser,
  python-neutron (= ${source:Version}),
- python-neutron-fwaas,
+# python-neutron-fwaas,
  ${misc:Depends},
  ${python:Depends}
 Breaks:
@@ -323,7 +323,7 @@ Depends:
  keepalived,
  neutron-common (= ${source:Version}),
  neutron-metadata-agent (= ${source:Version}),
- python-neutron-fwaas,
+# python-neutron-fwaas,
  radvd,
  ${misc:Depends},
  ${python:Depends},
@@ -406,17 +406,17 @@ Depends:
  python-netaddr (>= 0.7.12),
  python-neutronclient (>= 1:2.3.11),
  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.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-paste,
  python-pastedeploy (>= 1.5.0),
  python-pbr (>= 0.10),