X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=trusty%2Fdebian%2Fcontrol;h=41d75bbe4150ebd3d43c1b59e3e1e23cdfe656a3;hb=f28290b;hp=e4dd99d3bfb492a2f32b31ce12e54973a2df8e78;hpb=9475ccc71fba95de7316c83c45ab913066e01a14;p=openstack-build%2Fneutron-build.git

diff --git a/trusty/debian/control b/trusty/debian/control
index e4dd99d3b..41d75bbe4 100644
--- a/trusty/debian/control
+++ b/trusty/debian/control
@@ -2,11 +2,16 @@ 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),
+ dh-python,
+ python-all (>= 2.7.1),
+ python-sphinx (>= 1.1.2),
+ openstack-pkg-tools (>= 23~),
+ python-pbr,
+ python-setuptools
 Build-Depends-Indep:
  alembic (>= 0.7.2),
- python-anyjson (>= 0.3.3),
- python-babel (>= 1.3),
  python-cliff (>= 1.10.0),
  python-coverage (>= 3.6),
  python-eventlet (>= 0.16.1),
@@ -14,47 +19,48 @@ Build-Depends-Indep:
  python-greenlet (>= 0.3.2),
  python-hacking (>= 0.10.0),
  python-httplib2 (>= 0.7.5),
- python-iso8601 (>= 0.1.9),
  python-jinja2 (>= 2.6),
  python-jsonrpclib,
  python-keystoneclient (>= 1:1.1.0),
  python-keystonemiddleware (>= 1.5.0),
  python-mock (>= 1.0),
+ python-mysqldb,
  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-gflags,
  python-paste,
  python-pastedeploy (>= 1.5.0),
  python-pbr (>= 0.10),
+ python-psycopg2,
+ python-pyudev,
  python-requests (>= 2.2.0),
  python-requests-mock (>= 0.6.0),
  python-retrying (>= 1.2.3),
  python-routes (>= 1.12.3),
  python-setuptools,
- python-simplejson,
  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),
  python-tempest-lib (>= 0.4.0),
  python-testscenarios (>= 0.4),
  python-testtools (>= 0.9.36),
  python-webob (>= 1.2.3),
-XS-Python-Version: >= 2.7
+ subunit
 Standards-Version: 3.9.6
 XS-Testsuite: autopkgtest
 
@@ -62,7 +68,6 @@ Package: neutron-server
 Architecture: all
 Depends:
  adduser,
- conntrack,
  neutron-common (= ${source:Version}),
  ${misc:Depends},
  ${python:Depends},
@@ -86,8 +91,9 @@ Package: neutron-common
 Architecture: all
 Depends:
  adduser,
+ conntrack,
+ python-pyroute2,
  python-neutron (= ${source:Version}),
- python-neutron-fwaas,
  ${misc:Depends},
  ${python:Depends}
 Breaks:
@@ -392,8 +398,7 @@ Architecture: all
 Section: python
 Depends:
  alembic (>= 0.7.2),
- python-anyjson (>= 0.3.3),
- python-babel (>= 1.3),
+ iproute2,
  python-eventlet (>= 0.16.1),
  python-greenlet (>= 0.3.2),
  python-httplib2 (>= 0.7.5),
@@ -402,21 +407,20 @@ Depends:
  python-jsonrpclib,
  python-keystoneclient (>= 1:1.1.0),
  python-keystonemiddleware (>= 1.5.0),
- python-kombu (>= 2.5.0),
  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),
@@ -786,3 +790,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