Merge lp:~gandelman-a/ubuntu/raring/quantum/fix_bin_conflicts into lp:~openstack-ubuntu-testing/neutron/grizzly

[Adam Gandelman]

Hopefully fixes a number of binary conflicts, one of which affects the package currently in Raring.

[James Page (james-page)]

Good spots.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-02-19 15:28:20 +0000
+++ debian/changelog	2013-02-19 22:44:22 +0000
@@ -6,6 +6,14 @@
     /etc/quantum/quantum.conf.
   * debian/patches/fix-ubuntu-tests.patch: Refreshed, added skipTests for
     linuxbridge tests that attempt to setup udev monitors.
+  * debian/{control, quantum-server.install}: Drop quantum-ns-metadata-proxy,
+    quantum-metadata-agent, quantum-debug from quantum-server package and set a
+    Break/Replaces on the last quantum-server package that shipped them.
+    (LP: #1112203)
+  * debian/{control, quantum-plugin-nec.install}:  Drop rootwrap filters,
+    only install /w the agent.
+  * debian/control: Add Breaks/Replaces between quantum-plugin-nec and new
+    quantum-plugin-nec-agent.
 
   [ Yolanda Robla ]
   * debian/patches: refreshed patches
 
=== modified file 'debian/control'
--- debian/control	2013-02-19 15:28:20 +0000
+++ debian/control	2013-02-19 22:44:22 +0000
@@ -69,8 +69,8 @@
  python-quantum (= ${source:Version}),
  ${misc:Depends},
  ${python:Depends}
-Breaks: quantum-server ( <= 2012.2~rc1~20120907.1154-0ubuntu1 )
-Replaces: quantum-server ( <= 2012.2~rc1~20120907.1154-0ubuntu1 )
+Breaks: quantum-server ( <= 2013.1~g2-0ubuntu1 )
+Replaces: quantum-server ( <= 2013.1~g2-0ubuntu1 )
 Description: Quantum is a virtual network service for Openstack - common
  Quantum is a virtual network service for Openstack, and a part of
  Netstack. Just like OpenStack Nova provides an API to dynamically
@@ -132,6 +132,8 @@
  ${misc:Depends},
  ${python:Depends},
  ${shlibs:Depends}
+Breaks: quantum-plugin-nec ( <= 2013.1~g2-0ubuntu1 )
+Replaces: quantum-plugin-nec ( <= 2013.1~g2-0ubuntu1 )
 Description: Quantum is a virtual network service for Openstack - NEC plugin agent
  Quantum is a virtual network service for Openstack, and a part of
  Netstack. Just like OpenStack Nova provides an API to dynamically
@@ -271,8 +273,10 @@
  ${misc:Depends},
  ${python:Depends},
  ${shlibs:Depends}
-Breaks: quantum-common ( <= 2012.2~rc1~20120907.1154-0ubuntu1 )
-Replaces: quantum-common ( <= 2012.2~rc1~20120907.1154-0ubuntu1 )
+Breaks: quantum-common ( <= 2012.2~rc1~20120907.1154-0ubuntu1 ),
+ quantum-server ( <= 2013.1~g2-0ubuntu1 )
+Replaces: quantum-common ( <= 2012.2~rc1~20120907.1154-0ubuntu1 ),
+ quantum-server ( <= 2013.1~g2-0ubuntu1 )
 Description: Quantum is a virtual network service for Openstack - l3 agent
  Quantum is a virtual network service for Openstack, and a part of
  Netstack. Just like OpenStack Nova provides an API to dynamically
 
=== modified file 'debian/quantum-plugin-nec.install'
--- debian/quantum-plugin-nec.install	2013-02-16 23:43:06 +0000
+++ debian/quantum-plugin-nec.install	2013-02-19 22:44:22 +0000
@@ -1,3 +1,1 @@
-bin/quantum-nec-agent usr/bin
 etc/quantum/plugins/nec/* etc/quantum/plugins/nec
-etc/quantum/rootwrap.d/nec-plugin.filters etc/quantum/rootwrap.d
 
=== modified file 'debian/quantum-server.install'
--- debian/quantum-server.install	2013-02-16 23:43:06 +0000
+++ debian/quantum-server.install	2013-02-19 22:44:22 +0000
@@ -1,4 +1,1 @@
-bin/quantum-debug usr/bin
-bin/quantum-metadata-agent usr/bin
-bin/quantum-ns-metadata-proxy usr/bin
 bin/quantum-server usr/bin