neutron-l3-agent & neutron-vpn-agent now conflicts with each other

Change-Id: I84c0ba547c08c985b8278f7fec8ad8f1e9f72d0c

diff --git a/debian/changelog b/debian/changelog
index 11e66b5ef4036ef35d20725f8b01b32ac4ec574e..142a62dd7d5450235901c3ae8a022f229b1cebe8 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+neutron (2013.2-7) UNRELEASED; urgency=low
+
+  * neutron-l3-agent & neutron-vpn-agent now conflicts with each other.
+
+ -- Thomas Goirand <zigo@debian.org>  Mon, 02 Dec 2013 22:39:46 +0800
+
 neutron (2013.2-6) unstable; urgency=low
 
   * Now starts the openvswitch agent using the ml2 config if this is the plugin

diff --git a/debian/control b/debian/control
index afe6152140b42475898d23fbcfab685b87e4e4a8..b60c1ed7dd8c209c5a9aa9f388f4fb85984ed0ba 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -243,6 +243,7 @@ Depends: adduser,
          ${python:Depends},
          ${shlibs:Depends}
 Recommends: openvswitch-switch
+Conflicts: neutron-vpn-agent
 Breaks: quantum-l3-agent (<< 2013.2~)  
 Replaces: quantum-l3-agent (<< 2013.2~)
 Description: OpenStack virtual network service - l3 agent
@@ -324,6 +325,7 @@ Depends: adduser,
          ${python:Depends},
          ${shlibs:Depends}
 Provides: neutron-plugin-vpn-agent
+Conflicts: neutron-l3-agent
 Breaks: quantum-server (<< 2013.2~)
 Replaces: quantum-server (<< 2013.2~)
 Description: OpenStack virtual network service - VPN agent