From: Thomas Goirand Date: Wed, 3 Feb 2016 16:59:54 +0000 (+0000) Subject: * neutron-linuxbridge-agent Breaks + Replaes older neutron-common X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=805584e56d0bc914368aa6a4d7a030056cb0202b;p=openstack-build%2Fneutron-build.git * neutron-linuxbridge-agent Breaks + Replaes older neutron-common (Closes: #813068). Rewritten-From: 5bacd213f8211cce80724fc8bf3571bd5e297756 --- diff --git a/xenial/debian/changelog b/xenial/debian/changelog index b4252cfee..d1ce2ca0e 100644 --- a/xenial/debian/changelog +++ b/xenial/debian/changelog @@ -5,6 +5,8 @@ neutron (2:8.0.0~b2-3) UNRELEASED; urgency=medium * Do not -X/usr/bin when calling dh_install. * Fixed auth_protocol to be http and not https by default. * Drop Provides: argparse (Closes: #810728). + * neutron-linuxbridge-agent Breaks + Replaes older neutron-common + (Closes: #813068). -- Thomas Goirand Thu, 28 Jan 2016 07:34:12 +0000 diff --git a/xenial/debian/control b/xenial/debian/control index 4c04f57c4..f34b5138c 100644 --- a/xenial/debian/control +++ b/xenial/debian/control @@ -32,6 +32,7 @@ Build-Depends-Indep: alembic (>= 0.8.0), python-netaddr (>= 0.7.12), python-neutronclient (>= 1:2.6.0), python-novaclient (>= 2:2.30.1), + python-openvswitch, python-os-testr (>= 0.4.2), python-oslo.concurrency (>= 2.3.0), python-oslo.config (>= 1:3.2.0), @@ -50,12 +51,11 @@ Build-Depends-Indep: alembic (>= 0.8.0), python-oslo.versionedobjects (>= 1.0.0), python-oslosphinx (>= 2.5.0), python-oslotest (>= 1.10.0), - python-openvswitch, python-paste, python-pastedeploy, python-pecan (>= 1.0.0), - python-pyudev, python-pymysql, + python-pyudev, python-requests (>= 2.8.1), python-requests-mock (>= 0.7.0), python-retrying, @@ -97,6 +97,7 @@ Depends: alembic (>= 0.8.0), python-netaddr (>= 0.7.12), python-neutronclient (>= 1:2.6.0), python-novaclient (>= 2:2.30.1), + python-openvswitch, python-oslo.concurrency (>= 2.3.0), python-oslo.config (>= 1:3.2.0), python-oslo.context (>= 0.2.0), @@ -112,11 +113,10 @@ Depends: alembic (>= 0.8.0), python-oslo.service (>= 1.0.0), python-oslo.utils (>= 3.2.0), python-oslo.versionedobjects (>= 1.0.0), - python-openvswitch, python-paste, python-pastedeploy, - python-pecan (>= 1.0.0), python-pbr (>= 1.8), + python-pecan (>= 1.0.0), python-psycopg2, python-pymysql, python-pyudev, @@ -304,8 +304,10 @@ Description: OpenStack virtual network service - Open vSwitch agent Package: neutron-linuxbridge-agent Architecture: all -Replaces: neutron-plugin-linuxbridge-agent (<<2015.1~b3-1), -Breaks: neutron-plugin-linuxbridge-agent (<<2015.1~b3-1), +Replaces: neutron-common (<< 1:8.0.0~b1), + neutron-plugin-linuxbridge-agent (<<2015.1~b3-1), +Breaks: neutron-common (<< 1:8.0.0~b1), + neutron-plugin-linuxbridge-agent (<<2015.1~b3-1), Provides: neutron-plugin-linuxbridge-agent, Depends: bridge-utils, neutron-common (= ${source:Version}), diff --git a/xenial/debian/neutron-common.dirs b/xenial/debian/neutron-common.dirs index 72cd82b4d..2b06aa26a 100644 --- a/xenial/debian/neutron-common.dirs +++ b/xenial/debian/neutron-common.dirs @@ -1,2 +1,2 @@ -etc/neutron/rootwrap.d etc/neutron/plugins +etc/neutron/rootwrap.d diff --git a/xenial/debian/neutron-server.manpages b/xenial/debian/neutron-server.manpages index 6d556fbdb..2c37937c8 100644 --- a/xenial/debian/neutron-server.manpages +++ b/xenial/debian/neutron-server.manpages @@ -1,2 +1,2 @@ -debian/mans/neutron-server.8 debian/mans/neutron-rootwrap.8 +debian/mans/neutron-server.8