Merge branch 'debian/kilo' of git+ssh://git.debian.org/git/openstack/neutron into...

Conflicts:
	debian/control

Rewritten-From: b6760398971f4c0ac26ae460feb4e99e421ca0cb

diff --cc xenial/debian/changelog
index 0a58212bfc957baba8b1d973ae1b3c5417a23b71,42e7335f555fe83dccdc53c79f3151c2cf03830b..eda1769977cbd64b57d2fd94e10399c141e10513
--- 1/xenial/debian/changelog
--- 2/xenial/debian/changelog
+++ b/xenial/debian/changelog
@@@ -1,5 -1,6 +1,6 @@@
 -neutron (2015.1~b3-1) UNRELEASED; urgency=medium
 +neutron (2015.1~rc1-1) UNRELEASED; urgency=medium
  
+   [ Thomas Goirand ]
    * New upstream release.
    * Updated (build-)depends for this release.
    * Removed quantum transition packages, and lbass package (the later is now a

diff --cc xenial/debian/control
index 8120459b03b668dc48b7a7156af1d388fa7bd73f,a0f60bc612f44e24b29928381b9c12161f48f732..702bd869a278708e8f75b85856b740687ab01b10
--- 1/xenial/debian/control
--- 2/xenial/debian/control
+++ b/xenial/debian/control
@@@ -30,22 -30,24 +30,23 @@@ Build-Depends-Indep: alembic (>= 0.7.2)
                       python-mock (>= 1.0),
                       python-netaddr (>= 0.7.6),
                       python-netifaces,
+                      python-neutron-lbaas (>= 2015.1~b2),
                       python-neutronclient (>= 2.3.11),
 -                     python-nose,
 -                     python-nosexcover,
 -                     python-novaclient (>= 2:2.18.0),
 -                     python-oslo.concurrency (>= 1.4.1),
 -                     python-oslo.config (>= 1.9.0),
 +                     python-novaclient (>= 2:2.22.0),
 +#                     python-neutron-lbaas (>= 2015.1~b2),
 +                     python-oslo.concurrency (>= 1.8.0),
 +                     python-oslo.config (>= 1:1.9.3),
                       python-oslo.context (>= 0.2.0),
 -                     python-oslo.db (>= 1.5.0),
 -                     python-oslo.i18n (>= 1.3.0),
 -                     python-oslo.log (>= 0.4.0),
 -                     python-oslo.messaging (>= 1.6.0),
 -                     python-oslo.middleware (>= 0.3.0),
 -                     python-oslo.rootwrap (>= 1.5.0),
 -                     python-oslo.serialization (>= 1.2.0),
 -                     python-oslo.utils (>= 1.2.0),
 -                     python-oslosphinx (>= 2.2.0.0),
 -                     python-oslotest (>= 1.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,
                       python-pastedeploy,
                       python-pyudev,
@@@ -276,9 -290,11 +285,12 @@@ Description: OpenStack virtual network 
   .
   This package provides the Neutron metering agent.
  
- Package: neutron-plugin-openvswitch-agent
+ Package: neutron-openvswitch-agent
  Architecture: all
  Pre-Depends: dpkg (>= 1.15.6~), openvswitch-switch (>= 1.9)
+ Replaces: neutron-plugin-openvswitch-agent (<<2015.1~b3-1)
+ Breaks: neutron-plugin-openvswitch-agent (<<2015.1~b3-1)
++Provides: neutron-plugin-openvswitch-agent
  Depends: neutron-common (= ${source:Version}),
           sudo,
           ${misc:Depends},