neutron-*-agent packages are now breaking + replace only old versions of Quantum...

Change-Id: Ib27461afbcc2756ac8577bf2dbd349d189639ecc

diff --git a/debian/changelog b/debian/changelog
index c5efc65c2ea7433547080400532e5a57f2a8ef7f..9cd92830753ba7a01addd83df01d7262a5159c0b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+neutron (2013.2-4) UNRELEASED; urgency=low
+
+  * neutron-*-agent packages are now breaking + replace only old versions of
+    Quantum packages: those who were not transition packages (Closes: #727235).
+
+ -- Thomas Goirand <zigo@debian.org>  Thu, 24 Oct 2013 02:09:41 +0800
+
 neutron (2013.2-3) unstable; urgency=low
 
   * Really fix db setup (Closes: #726719).

diff --git a/debian/control b/debian/control
index 87340987c737caa19d19d229e79df5368e217910..ac700aa1a8a0061eef2e0a58d46db773ae534be0 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -196,11 +196,11 @@ Provides: neutron-plugin,
           quantum-plugin-openvswitch,
           quantum-plugin-plumgrid,
           quantum-plugin-ryu
-Breaks: quantum-plugin-linuxbridge-agent,
-        quantum-plugin-openvswitch-agent,
-        quantum-server (<= 2013.2~)
-Replaces: quantum-plugin-linuxbridge-agent,
-          quantum-plugin-openvswitch-agent,
+Breaks: quantum-plugin-linuxbridge-agent (<< 2013.2~),
+        quantum-plugin-openvswitch-agent (<< 2013.2~),
+        quantum-server (<< 2013.2~)
+Replaces: quantum-plugin-linuxbridge-agent (<< 2013.2~),
+          quantum-plugin-openvswitch-agent (<< 2013.2~),
           quantum-server (<< 2013.2~)
 Description: OpenStack virtual network service - common files
  Neutron provides an API to dynamically request and configure virtual networks.
@@ -359,8 +359,8 @@ Depends: neutron-common (= ${source:Version}),
          ${misc:Depends},
          ${python:Depends},
          ${shlibs:Depends}
-Breaks: python-quantum (<< 2013.2~)
-Replaces: python-quantum (<< 2013.2~)
+Breaks: python-quantum (<< 2013.2~), quantum-plugin-openvswitch-agent (<< 2013.2~)
+Replaces: python-quantum (<< 2013.2~), quantum-plugin-openvswitch-agent (<< 2013.2~)
 Recommends: openvswitch-datapath-dkms
 Description: OpenStack virtual network service - Open vSwitch agent
  Neutron provides an API to dynamically request and configure virtual networks.
@@ -380,8 +380,8 @@ Depends: bridge-utils,
          ${misc:Depends},
          ${python:Depends},
          ${shlibs:Depends}
-Breaks: python-quantum (<< 2013.2~)
-Replaces: python-quantum (<< 2013.2~)
+Breaks: python-quantum (<< 2013.2~), quantum-plugin-linuxbridge-agent (<< 2013.2~)
+Replaces: python-quantum (<< 2013.2~), quantum-plugin-linuxbridge-agent (<< 2013.2~)
 Description: OpenStack virtual network service - Linux bridge agent
  Neutron provides an API to dynamically request and configure virtual networks.
  These networks connect "interfaces" from other OpenStack services (such as