Remove Hardcode version for python-sqlalchemy

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

diff --git a/debian/control b/debian/control
index fd783a9aecf12bf12df35963d67d6dd73138a5a3..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
@@ -631,7 +637,7 @@ Description: Neutron is a virtual network service for Openstack - Midonet plugin
  .
  This package provides the Midonet plugin.
 
-Package: neutron-plugin-mlnx-agent
+Package: neutron-plugin-mlnx
 Architecture: all
 Provides: neutron-plugin
 Depends:
@@ -639,7 +645,9 @@ Depends:
  ${misc:Depends},
  ${python:Depends},
  ${shlibs:Depends}
-Description: Neutron is a virtual network service for Openstack - mlnx plugin agent
+Breaks: neutron-plugin-mlnx-agent ( << 1:2014.1~b3-0ubuntu2~ )
+Replaces: neutron-plugin-mlnx-agent ( << 1:2014.1~b3-0ubuntu2~ )
+Description: Neutron is a virtual network service for Openstack - Mellanox plugin
  Neutron is a virtual network service for Openstack, and a part of
  Netstack. Just like OpenStack Nova provides an API to dynamically
  request and configure virtual servers, Neutron provides an API to
@@ -649,16 +657,41 @@ Description: Neutron is a virtual network service for Openstack - mlnx plugin ag
  advanced network capabilities (e.g., QoS, ACLs, network monitoring,
  etc.)
  .
- This package provides the mlnx plugin agent.
+ This package provides the Mellanox plugin.
 
-Package: neutron-plugin-vpn-agent
+Package: neutron-plugin-mlnx-agent
 Architecture: all
 Provides: neutron-plugin
 Depends:
  neutron-common (= ${source:Version}),
+ neutron-plugin-mlnx,
+ ${misc:Depends},
+ ${python:Depends},
+ ${shlibs:Depends}
+Description: Neutron is a virtual network service for Openstack - Mellanox plugin agent
+ Neutron is a virtual network service for Openstack, and a part of
+ Netstack. Just like OpenStack Nova provides an API to dynamically
+ request and configure virtual servers, Neutron provides an API to
+ dynamically request and configure virtual networks. These networks
+ connect "interfaces" from other OpenStack services (e.g., virtual NICs
+ from Nova VMs). The Neutron API supports extensions to provide
+ advanced network capabilities (e.g., QoS, ACLs, network monitoring,
+ etc.)
+ .
+ This package provides the Mellanox plugin agent.
+
+Package: neutron-vpn-agent
+Architecture: all
+Depends:
+ iputils-arping,
+ neutron-common (= ${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
@@ -669,15 +702,23 @@ 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-metering-agent
+Package: neutron-plugin-vpn-agent
+Architecture: all
+Depends: neutron-vpn-agent, ${misc:Depends}
+Description: transitional dummy package
+ This is a transitional dummy package. It can safely be removed.
+
+Package: neutron-metering-agent
 Architecture: all
 Depends:
  neutron-common (= ${source:Version}),
  ${misc:Depends},
  ${python:Depends},
  ${shlibs:Depends}
+Breaks: neutron-plugin-metering-agent ( << 1:2014.1~b3-0ubuntu2~ )
+Replaces: neutron-plugin-metering-agent ( << 1:2014.1~b3-0ubuntu2~ )
 Description: Neutron is a virtual network service for Openstack - metering agent
  Neutron is a virtual network service for Openstack, and a part of
  Netstack. Just like OpenStack Nova provides an API to dynamically
@@ -690,6 +731,12 @@ Description: Neutron is a virtual network service for Openstack - metering agent
  .
  This package provides the metering agent.
 
+Package: neutron-plugin-metering-agent
+Architecture: all
+Depends: neutron-metering-agent, ${misc:Depends}
+Description: transitional dummy package
+ This is a transitional dummy package. It can safely be removed.
+
 Package: neutron-plugin-openflow-agent
 Architecture: all
 Depends:
@@ -748,3 +795,41 @@ Description: Neutron is a virtual network service for Openstack - IBM agent
  .
  This package provides the IBM agent.
 
+Package: neutron-plugin-oneconvergence
+Architecture: all
+Provides: neutron-plugin
+Depends:
+ neutron-common (= ${source:Version}),
+ ${misc:Depends},
+ ${python:Depends},
+ ${shlibs:Depends}
+Description: Neutron is a virtual network service for Openstack - One Convergence plugin
+ Neutron is a virtual network service for Openstack, and a part of
+ Netstack. Just like OpenStack Nova provides an API to dynamically
+ request and configure virtual servers, Neutron provides an API to
+ dynamically request and configure virtual networks. These networks
+ connect "interfaces" from other OpenStack services (e.g., virtual NICs
+ from Nova VMs). The Neutron API supports extensions to provide
+ advanced network capabilities (e.g., QoS, ACLs, network monitoring,
+ etc.)
+ .
+ This package provides the One Convergence plugin.
+
+Package: neutron-plugin-oneconvergence-agent
+Architecture: all
+Depends:
+ neutron-plugin-oneconvergence (= ${source:Version}),
+ ${misc:Depends},
+ ${python:Depends},
+ ${shlibs:Depends}
+Description: Neutron is a virtual network service for Openstack - One Convergence agent
+ Neutron is a virtual network service for Openstack, and a part of
+ Netstack. Just like OpenStack Nova provides an API to dynamically
+ request and configure virtual servers, Neutron provides an API to
+ dynamically request and configure virtual networks. These networks
+ connect "interfaces" from other OpenStack services (e.g., virtual NICs
+ from Nova VMs). The Neutron API supports extensions to provide
+ advanced network capabilities (e.g., QoS, ACLs, network monitoring,
+ etc.)
+ .
+ This package provides the One Convergence agent.