Update DEB specs to v. 2014.1.1

[openstack-build/neutron-build.git] / debian / control

diff --git a/debian/control b/debian/control
index ce201112e9e1c5fb9c762c1eeee63e1123cbef5f..33b108e7c9e5d93c3187c3048a15461e9157ef04 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -60,8 +60,8 @@ Depends:
  ${misc:Depends},
  ${python:Depends},
  ${shlibs:Depends}
-Breaks: quantum-server ( << 1:2013.2~b2-0ubuntu1~ )
-Replaces: quantum-server  ( << 1:2013.2~b2-0ubuntu1~ )
+Breaks: quantum-server (<< 1:2013.2~b2-0ubuntu1~)
+Replaces: quantum-server (<< 1:2013.2~b2-0ubuntu1~)
 Recommends: neutron-plugin-ml2
 Description: Neutron is a virtual network service for Openstack - server
  Neutron is a virtual network service for Openstack, and a part of
@@ -82,8 +82,14 @@ Depends:
  python-neutron (= ${source:Version}),
  ${misc:Depends},
  ${python:Depends}
-Breaks: quantum-common ( << 1:2013.2~b2-0ubuntu1~ )
-Replaces: quantum-common ( << 1:2013.2~b2-0ubuntu1~ )
+Breaks:
+ neutron-l3-agent (<< 1:2014.1~rc2-0ubuntu3~),
+ neutron-vpn-agent (<< 1:2014.1~rc2-0ubuntu3~),
+ quantum-common ( << 1:2013.2~b2-0ubuntu1~ )
+Replaces:
+ neutron-l3-agent (<< 1:2014.1~rc2-0ubuntu3~),
+ neutron-vpn-agent (<< 1:2014.1~rc2-0ubuntu3~),
+ quantum-common ( << 1:2013.2~b2-0ubuntu1~ )
 Description: Neutron is a virtual network service for Openstack - common
  Neutron is a virtual network service for Openstack, and a part of
  Netstack. Just like OpenStack Nova provides an API to dynamically
@@ -677,13 +683,15 @@ Description: Neutron is a virtual network service for Openstack - Mellanox plugi
 Package: neutron-vpn-agent
 Architecture: all
 Depends:
+ iputils-arping,
  neutron-common (= ${source:Version}),
- neutron-l3-agent (= ${source:Version}),
+ neutron-metadata-agent (= ${source:Version}),
  ${misc:Depends},
  ${python:Depends},
  ${shlibs:Depends}
 Breaks: neutron-plugin-vpn-agent ( << 1:2014.1~b3-0ubuntu2~ )
 Replaces: neutron-plugin-vpn-agent ( << 1:2014.1~b3-0ubuntu2~ )
+Conflicts: neutron-l3-agent
 Description: Neutron is a virtual network service for Openstack - VPN agent
  Neutron is a virtual network service for Openstack, and a part of
  Netstack. Just like OpenStack Nova provides an API to dynamically
@@ -694,7 +702,7 @@ Description: Neutron is a virtual network service for Openstack - VPN agent
  advanced network capabilities (e.g., QoS, ACLs, network monitoring,
  etc.)
  .
- This package provides the VPN agent.
+ This package provides the VPN agent, which also provides L3 agent support.
 
 Package: neutron-plugin-vpn-agent
 Architecture: all
@@ -825,4 +833,3 @@ Description: Neutron is a virtual network service for Openstack - One Convergenc
  etc.)
  .
  This package provides the One Convergence agent.
-