Merge lp:~james-page/neutron/grizzly-updates-1 into lp:~openstack-ubuntu-testing/neutron/grizzly

[James Page]

Various updates for quantum - see changelog for details.

=== modified file 'debian/changelog'
--- debian/changelog	2012-12-04 18:37:44 +0000
+++ debian/changelog	2012-12-06 15:39:21 +0000
@@ -2,13 +2,34 @@
 
   [ Chuck Short ]
   * New upstream version. 
-  * debian/quantum-server.install: Add quantum-ns-metadata-proxy
-    and quantum-metadata-agent
   * debian/patches/fix-quantum-configuration.patch: Refreshed.
 
   [ Yolanda Robla ]
-  * debian/quantum-metadata-agent.upstart
-  * debian/patches/fix-quantum-configuration.patch
+  * debian/quantum-l3-agent.quantum-metadata-agent.upstart: Add
+    upstart configuration for Metadata Agent.
+  * debian/quantum-l3-agent.install: Added quantum-ns-metadata-proxy,
+    quantum-metadata-agent and metadata_agent.ini.
+  * debian/patches/fix-quantum-configuration.patch: Update rootwrap
+    configuration in metadata_agent.ini file.
+
+  [ James Page ]
+  * d/*.install: Install entry points from bin directory instead
+    of easy-install ones generated during the package build process
+    (LP: #1085038).
+  * d/control: Drop BD on python-dev-all; its not required.
+  * d/rules: Install multiple upstart configurations for quantum-l3-agent.
+  * d/control: Tidy package descriptions.
+  * d/*.postrm: Drop as debhelper will generate update-rc.d calls in
+    maintainer scripts if required.
+  * d/quantum-common.postinst: Tweak permissions setting so that /etc/quantum
+    is not owned/writable by the quantum user, ensure that /etc/quantum/rootwrap*
+    is owned by root:root.
+  * d/*agent*.postinst: Dropped as permissions now correctly set in
+    quantum-common.
+
+  [ Maru Newby ]
+  * debian/control: Remove unnecessary openvswitch-vswitch dependency
+    from quantum-plugin-openvswitch (LP: #1076747).
 
  -- Chuck Short <[e-mail]>  Sat, 01 Dec 2012 12:21:02 -0600
 

=== modified file 'debian/control'
--- debian/control	2012-09-21 17:21:10 +0000
+++ debian/control	2012-12-06 15:39:21 +0000
@@ -3,8 +3,7 @@
 Priority: optional
 Maintainer: Chuck Short <[e-mail]>
 Build-Depends: debhelper (>= 8.0.0),
-               python-all (>= 2.6),
-               python-all-dev (>= 2.6.6-3~)
+               python-all (>= 2.6)
 Build-Depends-Indep: pep8,
  python-amqplib,
  python-anyjson,
@@ -47,7 +46,7 @@
  ${python:Depends},
  ${shlibs:Depends}
 Recommends: quantum-plugin-openvswitch
-Description: server - Quantum is a virtual network service for Openstack
+Description: Quantum is a virtual network service for Openstack - server
  Quantum 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, Quantum provides an API to
@@ -57,7 +56,7 @@
  advanced network capabilities (e.g., QoS, ACLs, network monitoring,
  etc.)
  .
- This package provides the quantum server
+ This package provides the Quantum server
 
 Package: quantum-common
 Architecture: all
@@ -67,7 +66,7 @@
  ${python:Depends}
 Breaks: quantum-server ( <= 2012.2~rc1~20120907.1154-0ubuntu1 )
 Replaces: quantum-server ( <= 2012.2~rc1~20120907.1154-0ubuntu1 )
-Description: common - Quantum is a virtual network service for Openstack.
+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
  request and configure virtual servers, Quantum provides an API to
@@ -86,7 +85,7 @@
  ${misc:Depends},
  ${python:Depends},
  ${shlibs:Depends}
-Description: Quantum is a virtual network service for Openstack. (cisco plugin)
+Description: Quantum is a virtual network service for Openstack - Cisco plugin
  Quantum 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, Quantum provides an API to
@@ -96,7 +95,7 @@
  advanced network capabilities (e.g., QoS, ACLs, network monitoring,
  etc.)
  .
- This package provides the CISCO plugin.
+ This package provides the Cisco plugin.
 
 Package: quantum-plugin-nec
 Architecture: all
@@ -105,7 +104,7 @@
  ${misc:Depends},
  ${python:Depends},
  ${shlibs:Depends}
-Description: Quantum is a virtual network service for Openstack. (NEC plugin)
+Description: Quantum is a virtual network service for Openstack - NEC plugin
  Quantum 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, Quantum provides an API to
@@ -125,7 +124,7 @@
  ${misc:Depends},
  ${python:Depends},
  ${shlibs:Depends}
-Description: Quantum is a virtual network service for Openstack. (metaplugin plugin)
+Description: Quantum is a virtual network service for Openstack - Metaplugin plugin
  Quantum 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, Quantum provides an API to
@@ -135,7 +134,7 @@
  advanced network capabilities (e.g., QoS, ACLs, network monitoring,
  etc.)
  .
- This package provides the metaplugin plugin.
+ This package provides the Metaplugin plugin.
 
 Package: quantum-plugin-nicira
 Architecture: all
@@ -144,7 +143,7 @@
  ${misc:Depends},
  ${python:Depends},
  ${shlibs:Depends}
-Description: Quantum is a virtual network service for Openstack. (nicira plugin)
+Description: Quantum is a virtual network service for Openstack - Nicira plugin
  Quantum 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, Quantum provides an API to
@@ -154,7 +153,7 @@
  advanced network capabilities (e.g., QoS, ACLs, network monitoring,
  etc.)
  .
- This package provides the nicira plugin
+ This package provides the Nicira plugin
 
 Package: quantum-l3-agent
 Architecture: all
@@ -164,7 +163,7 @@
  ${shlibs:Depends}
 Breaks: quantum-common ( <= 2012.2~rc1~20120907.1154-0ubuntu1 )
 Replaces: quantum-common ( <= 2012.2~rc1~20120907.1154-0ubuntu1 )
-Description: Quantum is a virtual network service for Openstack. (l3 agent)
+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
  request and configure virtual servers, Quantum provides an API to
@@ -174,7 +173,7 @@
  advanced network capabilities (e.g., QoS, ACLs, network monitoring,
  etc.)
  .
- This package provides the l3 agent.
+ This package provides the layer 3 routing agent.
 
 Package: quantum-dhcp-agent
 Architecture: all
@@ -186,7 +185,7 @@
  ${shlibs:Depends}
 Breaks: quantum-common ( <= 2012.2~rc1~20120907.1154-0ubuntu1 )
 Replaces: quantum-common ( <= 2012.2~rc1~20120907.1154-0ubuntu1 )
-Description: Quantum is a virtual network service for Openstack. (dhcp agent)
+Description: Quantum is a virtual network service for Openstack - DHCP agent
  Quantum 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, Quantum provides an API to
@@ -196,7 +195,7 @@
  advanced network capabilities (e.g., QoS, ACLs, network monitoring,
  etc.)
  .
- This package provides the dhcp agent.
+ This package provides the DHCP agent.
 
 Package: python-quantum
 Architecture: all
@@ -224,7 +223,7 @@
  ${python:Depends}
 Provides: ${python:Provides}
 XB-Python-Version: ${python:Versions}
-Description: Quantum is a virutal network service for Openstack. (python library)
+Description: Quantum is a virutal network service for Openstack - Python library
  Quantum 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, Quantum provides an API to
@@ -234,17 +233,16 @@
  advanced network capabilities (e.g., QoS, ACLs, network monitoring,
  etc.)
  .
- This package provides the python library.
+ This package provides the Python library.
 
 Package: quantum-plugin-openvswitch
 Architecture: all
 Provides: quantum-plugin
-Depends: openvswitch-switch,
- quantum-common (= ${source:Version}),
+Depends: quantum-common (= ${source:Version}),
  ${misc:Depends},
  ${python:Depends},
  ${shlibs:Depends}
-Description: Quantum is a virtual network service for Openstack. (openvswitch plugin)
+Description: Quantum is a virtual network service for Openstack - Open vSwitch plugin
  Quantum 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, Quantum provides an API to
@@ -254,7 +252,7 @@
  advanced network capabilities (e.g., QoS, ACLs, network monitoring,
  etc.)
  .
- This package provides the openvswitch plugin.
+ This package provides the Open vSwitch plugin.
 
 Package: quantum-plugin-openvswitch-agent
 Architecture: all
@@ -266,7 +264,7 @@
  ${shlibs:Depends}
 Breaks: quantum-common ( <= 2012.2~rc1~20120907.1154-0ubuntu1 )
 Replaces: quantum-common ( <= 2012.2~rc1~20120907.1154-0ubuntu1 )
-Description: Quantum is a virtual network service for Openstack. (openvswitch plugin agent)
+Description: Quantum is a virtual network service for Openstack - Open vSwitch plugin agent
  Quantum 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, Quantum provides an API to
@@ -276,8 +274,7 @@
  advanced network capabilities (e.g., QoS, ACLs, network monitoring,
  etc.)
  .
- This package provides the openvswitch plugin agent
-
+ This package provides the Open vSwitch plugin agent.
 
 Package: quantum-plugin-linuxbridge
 Architecture: all
@@ -286,7 +283,7 @@
  ${misc:Depends},
  ${python:Depends},
  ${shlibs:Depends}
-Description: Quantum is a virtual network service for Openstack. (linuxbridge plugin)
+Description: Quantum is a virtual network service for Openstack - linuxbridge plugin
  Quantum 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, Quantum provides an API to
@@ -308,7 +305,7 @@
  ${shlibs:Depends}
 Breaks: quantum-common ( <= 2012.2~rc1~20120907.1154-0ubuntu1 )
 Replaces: quantum-common ( <= 2012.2~rc1~20120907.1154-0ubuntu1 )
-Description: Quantum is a virtual network service for Openstack. (linuxbridge plugin agent)
+Description: Quantum is a virtual network service for Openstack - linuxbridge plugin agent
  Quantum 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, Quantum provides an API to
@@ -327,7 +324,7 @@
   ${misc:Depends},
   ${python:Depends},
   ${shlibs:Depends}
-Description: Quantum is a virtual network service for Openstack. (ryu plugin)
+Description: Quantum is a virtual network service for Openstack - RYU plugin
  Quantum 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, Quantum provides an API to
@@ -337,7 +334,7 @@
  advanced network capabilities (e.g., QoS, ACLs, network monitoring,
  etc.)
  .
- This package provides the ryu plugin
+ This package provides the RYU plugin.
 
 Package: quantum-plugin-ryu-agent
 Architecture: all
@@ -350,7 +347,7 @@
  quantum-common ( <= 2012.2~rc1~20120907.1154-0ubuntu1 )
 Replaces: quantum-server ( << 2012.1-0ubuntu3 ),
  quantum-common ( <= 2012.2~rc1~20120907.1154-0ubuntu1 )
-Description: Quantum is a virtual network service for Openstack. (ryu plugin agent)
+Description: Quantum is a virtual network service for Openstack - RYU plugin agent
  Quantum 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, Quantum provides an API to
@@ -360,4 +357,4 @@
  advanced network capabilities (e.g., QoS, ACLs, network monitoring,
  etc.)
  .
- This package provides the ryu plugin agent.
+ This package provides the RYU plugin agent.

=== modified file 'debian/patches/fix-quantum-configuration.patch'
--- debian/patches/fix-quantum-configuration.patch	2012-12-04 18:37:44 +0000
+++ debian/patches/fix-quantum-configuration.patch	2012-12-06 15:39:21 +0000
@@ -1,6 +1,5 @@
-diff -Naurp quantum-2013.1.orig/etc/dhcp_agent.ini quantum-2013.1/etc/dhcp_agent.ini
---- quantum-2013.1.orig/etc/dhcp_agent.ini	2012-12-03 03:38:10.000000000 -0600
-+++ quantum-2013.1/etc/dhcp_agent.ini	2012-12-03 09:35:21.405425820 -0600
+--- a/etc/dhcp_agent.ini
++++ b/etc/dhcp_agent.ini
 @@ -4,7 +4,7 @@
  
  # Where to store dnsmasq state files.  This directory must be writable by the
@@ -16,9 +15,8 @@
  # Change to "sudo" to skip the filtering and just run the comand directly
 -root_helper = sudo
 +root_helper = sudo /usr/bin/quantum-rootwrap /etc/quantum/rootwrap.conf
-diff -Naurp quantum-2013.1.orig/etc/l3_agent.ini quantum-2013.1/etc/l3_agent.ini
---- quantum-2013.1.orig/etc/l3_agent.ini	2012-12-03 03:38:10.000000000 -0600
-+++ quantum-2013.1/etc/l3_agent.ini	2012-12-03 09:33:23.825425820 -0600
+--- a/etc/l3_agent.ini
++++ b/etc/l3_agent.ini
 @@ -20,7 +20,7 @@ admin_password = %SERVICE_PASSWORD%
  # Use "sudo quantum-rootwrap /etc/quantum/rootwrap.conf" to use the real
  # root filter facility.
@@ -28,9 +26,8 @@
  
  # Allow overlapping IP (Must have kernel build with CONFIG_NET_NS=y and
  # iproute2 package that supports namespaces).
-diff -Naurp quantum-2013.1.orig/etc/quantum/plugins/linuxbridge/linuxbridge_conf.ini quantum-2013.1/etc/quantum/plugins/linuxbridge/linuxbridge_conf.ini
---- quantum-2013.1.orig/etc/quantum/plugins/linuxbridge/linuxbridge_conf.ini	2012-12-03 03:38:10.000000000 -0600
-+++ quantum-2013.1/etc/quantum/plugins/linuxbridge/linuxbridge_conf.ini	2012-12-03 09:33:23.825425820 -0600
+--- a/etc/quantum/plugins/linuxbridge/linuxbridge_conf.ini
++++ b/etc/quantum/plugins/linuxbridge/linuxbridge_conf.ini
 @@ -26,7 +26,7 @@
  # sql_connection = mysql://root:nova@127.0.0.1:3306/quantum_linux_bridge
  # Replace 127.0.0.1 above with the IP address of the database used by the
@@ -40,9 +37,8 @@
  # Database reconnection retry times - in event connectivity is lost
  # set to -1 implies an infinite retry count
  # sql_max_retries = 10
-diff -Naurp quantum-2013.1.orig/etc/quantum.conf quantum-2013.1/etc/quantum.conf
---- quantum-2013.1.orig/etc/quantum.conf	2012-12-03 03:38:10.000000000 -0600
-+++ quantum-2013.1/etc/quantum.conf	2012-12-03 09:33:23.825425820 -0600
+--- a/etc/quantum.conf
++++ b/etc/quantum.conf
 @@ -38,13 +38,13 @@ bind_port = 9696
  # api_extensions_path =
  
@@ -59,10 +55,9 @@
  
  # The strategy to be used for auth.
  # Supported values are 'keystone'(default), 'noauth'.
-
---- quantum-2013.1.orig/etc/metadata_agent.ini  2012-12-01 16:31:33.000000000 +0100
-+++ quantum-2013.1/etc/metadata_agent.ini       2012-12-03 18:09:27.794483097 +0100
-@@ -12,12 +12,12 @@
+--- a/etc/metadata_agent.ini
++++ b/etc/metadata_agent.ini
+@@ -12,7 +12,7 @@ admin_password = %SERVICE_PASSWORD%
  # Use "sudo quantum-rootwrap /etc/quantum/rootwrap.conf" to use the real
  # root filter facility.
  # Change to "sudo" to skip the filtering and just run the comand directly
@@ -70,11 +65,4 @@
 +root_helper = sudo quantum-rootwrap /etc/quantum/rootwrap.conf
  
  # Where to store metadata state files.  This directory must be writable by the
- # user executing the agent. The value below is compatible with a default
- # devstack installation.
--state_path = /opt/stack/data/quantum
-+state_path = /var/lib/quantum
- 
- # IP address used by Nova metadata server
- # nova_metadata_ip = 127.0.0.1
-
+ # user executing the agent.

=== modified file 'debian/quantum-common.install'
--- debian/quantum-common.install	2012-11-12 16:16:47 +0000
+++ debian/quantum-common.install	2012-12-06 15:39:21 +0000
@@ -2,7 +2,7 @@
 etc/policy.json etc/quantum
 etc/quantum.conf etc/quantum
 etc/rootwrap.conf etc/quantum
-usr/bin/quantum-rootwrap
-usr/bin/quantum-netns-cleanup
+bin/quantum-rootwrap usr/bin
+bin/quantum-netns-cleanup usr/bin
 debian/quantum_sudoers etc/sudoers.d
 

=== modified file 'debian/quantum-common.postinst' (properties changed: +x to -x)
--- debian/quantum-common.postinst	2012-09-11 00:32:41 +0000
+++ debian/quantum-common.postinst	2012-12-06 15:39:21 +0000
@@ -12,12 +12,15 @@
 	then
 		adduser --system --home /var/lib/quantum --ingroup quantum --no-create-home --shell /bin/false quantum
 	fi
-	chown -R quantum:quantum /var/lib/quantum/ /etc/quantum/
+	chown -R quantum:quantum /var/lib/quantum/
+
 	chown -R quantum:adm /var/log/quantum/ 
-	chmod 0700 /etc/quantum/ 
 	chmod 0750 /var/log/quantum/
+
+    chown -R root:quantum /etc/quantum/
+    chmod 0750 /etc/quantum/
 	chown root:root /etc/quantum/rootwrap.conf
-	chown root:root /etc/quantum/rootwrap.d
+	chown -R root:root /etc/quantum/rootwrap.d
 	chmod 0755 /etc/quantum/rootwrap.d
 
 	if [ -f /etc/sudoers.d/quantum_sudoers ] ; then

=== modified file 'debian/quantum-dhcp-agent.install'
--- debian/quantum-dhcp-agent.install	2012-11-12 16:16:47 +0000
+++ debian/quantum-dhcp-agent.install	2012-12-06 15:39:21 +0000
@@ -1,5 +1,5 @@
 etc/dhcp_agent.ini etc/quantum
 etc/quantum/rootwrap.d/dhcp.filters etc/quantum/rootwrap.d
-usr/bin/quantum-dhcp-agent
-usr/bin/quantum-dhcp-agent-dnsmasq-lease-update
+bin/quantum-dhcp-agent usr/bin
+bin/quantum-dhcp-agent-dnsmasq-lease-update usr/bin
 debian/cron.d/quantum-dhcp-agent-netns-cleanup etc/cron.d

=== removed file 'debian/quantum-dhcp-agent.postinst'
--- debian/quantum-dhcp-agent.postinst	2012-09-10 20:16:42 +0000
+++ debian/quantum-dhcp-agent.postinst	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-#!/bin/sh -e
-if [ "$1" = "configure" ]; then
-  chown root:root /etc/quantum/rootwrap.d/dhcp.filters
-fi
-
-#DEBHELPER#
-

=== removed file 'debian/quantum-dhcp-agent.postrm'
--- debian/quantum-dhcp-agent.postrm	2012-09-08 00:16:27 +0000
+++ debian/quantum-dhcp-agent.postrm	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-#!/bin/sh -e
-
-if [ "$1" = purge ]; then
-	update-rc.d quantum-plugin-dhcp remove >/dev/null
-fi
-
-#DEBHELPER#

=== modified file 'debian/quantum-l3-agent.install'
--- debian/quantum-l3-agent.install	2012-12-03 17:49:37 +0000
+++ debian/quantum-l3-agent.install	2012-12-06 15:39:21 +0000
@@ -1,6 +1,7 @@
 etc/l3_agent.ini etc/quantum
 etc/quantum/rootwrap.d/l3.filters etc/quantum/rootwrap.d
-usr/bin/quantum-l3-agent
-usr/bin/quantum-ns-metadata-proxy
-usr/bin/quantum-metadata-agent
+bin/quantum-l3-agent usr/bin
+etc/metadata_agent.ini etc/quantum
+bin/quantum-ns-metadata-proxy usr/bin
+bin/quantum-metadata-agent usr/bin
 debian/cron.d/quantum-l3-agent-netns-cleanup etc/cron.d

=== removed file 'debian/quantum-l3-agent.postinst'
--- debian/quantum-l3-agent.postinst	2012-09-10 20:16:42 +0000
+++ debian/quantum-l3-agent.postinst	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-#!/bin/sh -e
-if [ "$1" = "configure" ]; then
-  chown root:root /etc/quantum/rootwrap.d/l3.filters
-fi
-
-#DEBHELPER#
-

=== removed file 'debian/quantum-l3-agent.postrm'
--- debian/quantum-l3-agent.postrm	2012-09-08 00:16:27 +0000
+++ debian/quantum-l3-agent.postrm	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-#!/bin/sh -e
-
-if [ "$1" = purge ]; then
-	update-rc.d quantum-plugin-l3-agent remove >/dev/null
-fi
-
-#DEBHELPER#

=== modified file 'debian/quantum-l3-agent.quantum-l3-agent.upstart' (properties changed: +x to -x)
=== modified file 'debian/quantum-l3-agent.quantum-metadata-agent.upstart' (properties changed: +x to -x)
--- debian/quantum-l3-agent.quantum-metadata-agent.upstart	2012-12-04 17:17:24 +0000
+++ debian/quantum-l3-agent.quantum-metadata-agent.upstart	2012-12-06 15:39:21 +0000
@@ -13,4 +13,4 @@
 
 exec start-stop-daemon --start --chuid quantum --exec /usr/bin/quantum-metadata-agent -- \
             --config-file=/etc/quantum/quantum.conf --config-file=/etc/quantum/metadata_agent.ini \
-            --log-file /var/log/quantum/metadata-agent.log
+            --log-file=/var/log/quantum/metadata-agent.log

=== modified file 'debian/quantum-plugin-linuxbridge-agent.install'
--- debian/quantum-plugin-linuxbridge-agent.install	2012-11-12 16:16:47 +0000
+++ debian/quantum-plugin-linuxbridge-agent.install	2012-12-06 15:39:21 +0000
@@ -1,2 +1,2 @@
-usr/bin/quantum-linuxbridge-agent
+bin/quantum-linuxbridge-agent usr/bin
 etc/quantum/rootwrap.d/linuxbridge-plugin.filters etc/quantum/rootwrap.d

=== removed file 'debian/quantum-plugin-linuxbridge-agent.postinst'
--- debian/quantum-plugin-linuxbridge-agent.postinst	2012-09-10 20:16:42 +0000
+++ debian/quantum-plugin-linuxbridge-agent.postinst	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-#!/bin/sh -e
-if [ "$1" = "configure" ]; then
-  chown root:root /etc/quantum/rootwrap.d/linuxbridge-plugin.filters
-fi
-
-#DEBHELPER#
-

=== removed file 'debian/quantum-plugin-linuxbridge-agent.postrm'
--- debian/quantum-plugin-linuxbridge-agent.postrm	2012-09-07 20:19:49 +0000
+++ debian/quantum-plugin-linuxbridge-agent.postrm	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-#!/bin/sh -e
-
-if [ "$1" = purge ]; then
-	update-rc.d quantum-plugin-linuxbridge-agent remove >/dev/null
-fi
-
-#DEBHELPER#

=== modified file 'debian/quantum-plugin-linuxbridge-agent.upstart' (properties changed: +x to -x)
=== modified file 'debian/quantum-plugin-nec.install'
--- debian/quantum-plugin-nec.install	2012-11-15 02:52:20 +0000
+++ debian/quantum-plugin-nec.install	2012-12-06 15:39:21 +0000
@@ -1,3 +1,3 @@
 etc/quantum/plugins/nec/* etc/quantum/plugins/nec
-usr/bin/quantum-nec-agent
+bin/quantum-nec-agent usr/bin
 etc/quantum/rootwrap.d/nec-plugin.filters etc/quantum/rootwrap.d

=== removed file 'debian/quantum-plugin-nec.postinst'
--- debian/quantum-plugin-nec.postinst	2012-09-10 23:59:44 +0000
+++ debian/quantum-plugin-nec.postinst	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-#!/bin/sh -e
-if [ "$1" = "configure" ]; then
-  chown root:root /etc/quantum/rootwrap.d/nec-plugin.filters
-fi
-
-#DEBHELPER#
-

=== modified file 'debian/quantum-plugin-openvswitch-agent.install'
--- debian/quantum-plugin-openvswitch-agent.install	2012-11-12 16:16:47 +0000
+++ debian/quantum-plugin-openvswitch-agent.install	2012-12-06 15:39:21 +0000
@@ -1,2 +1,2 @@
-usr/bin/quantum-openvswitch-agent
+bin/quantum-openvswitch-agent usr/bin
 etc/quantum/rootwrap.d/openvswitch-plugin.filters etc/quantum/rootwrap.d

=== removed file 'debian/quantum-plugin-openvswitch-agent.postinst'
--- debian/quantum-plugin-openvswitch-agent.postinst	2012-09-10 20:16:42 +0000
+++ debian/quantum-plugin-openvswitch-agent.postinst	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-#!/bin/sh -e
-if [ "$1" = "configure" ]; then
-  chown root:root /etc/quantum/rootwrap.d/openvswitch-plugin.filters
-fi
-
-#DEBHELPER#
-

=== removed file 'debian/quantum-plugin-openvswitch-agent.postrm'
--- debian/quantum-plugin-openvswitch-agent.postrm	2012-09-07 20:19:49 +0000
+++ debian/quantum-plugin-openvswitch-agent.postrm	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-#!/bin/sh -e
-
-if [ "$1" = purge ]; then
-	update-rc.d quantum-plugin-openvswitch-agent remove >/dev/null
-fi
-
-#DEBHELPER#

=== modified file 'debian/quantum-plugin-openvswitch-agent.upstart' (properties changed: +x to -x)
=== modified file 'debian/quantum-plugin-ryu-agent.install'
--- debian/quantum-plugin-ryu-agent.install	2012-11-12 16:16:47 +0000
+++ debian/quantum-plugin-ryu-agent.install	2012-12-06 15:39:21 +0000
@@ -1,2 +1,2 @@
-usr/bin/quantum-ryu-agent
+bin/quantum-ryu-agent usr/bin
 etc/quantum/rootwrap.d/ryu-plugin.filters etc/quantum/rootwrap.d

=== removed file 'debian/quantum-plugin-ryu-agent.postinst'
--- debian/quantum-plugin-ryu-agent.postinst	2012-09-10 20:16:42 +0000
+++ debian/quantum-plugin-ryu-agent.postinst	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-#!/bin/sh -e
-if [ "$1" = "configure" ]; then
-  chown root:root /etc/quantum/rootwrap.d/ryu-plugin.filters
-fi
-
-#DEBHELPER#
-

=== removed file 'debian/quantum-plugin-ryu-agent.postrm'
--- debian/quantum-plugin-ryu-agent.postrm	2012-09-07 20:19:49 +0000
+++ debian/quantum-plugin-ryu-agent.postrm	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-#!/bin/sh -e
-
-if [ "$1" = purge ]; then
-	update-rc.d quantum-plugin-ryu-agent remove >/dev/null
-fi
-
-#DEBHELPER#

=== modified file 'debian/quantum-plugin-ryu-agent.upstart' (properties changed: +x to -x)
=== modified file 'debian/quantum-server.install'
--- debian/quantum-server.install	2012-12-01 18:32:39 +0000
+++ debian/quantum-server.install	2012-12-06 15:39:21 +0000
@@ -1,4 +1,4 @@
-usr/bin/quantum-server
-usr/bin/quantum-debug
-usr/bin/quantum-ns-metadata-proxy
-usr/bin/quantum-metadata-agent
+bin/quantum-server usr/bin
+bin/quantum-debug usr/bin
+bin/quantum-ns-metadata-proxy usr/bin
+bin/quantum-metadata-agent usr/bin

=== removed file 'debian/quantum-server.postrm'
--- debian/quantum-server.postrm	2012-09-07 20:19:49 +0000
+++ debian/quantum-server.postrm	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-#!/bin/sh -e
-
-if [ "$1" = purge ]; then
-	update-rc.d quantum-server remove >/dev/null
-fi
-
-#DEBHELPER#

=== modified file 'debian/quantum-server.upstart' (properties changed: +x to -x)
=== modified file 'debian/rules'
--- debian/rules	2012-11-15 18:01:28 +0000
+++ debian/rules	2012-12-06 15:39:21 +0000
@@ -7,7 +7,12 @@
 	dh $@  --with python2
 
 override_dh_install:
-	dh_install --fail-missing -X/usr/etc
+	dh_install --fail-missing -X/usr/etc -X/usr/bin
+
+override_dh_installinit:
+	dh_installinit -pquantum-l3-agent --name=quantum-l3-agent
+	dh_installinit -pquantum-l3-agent --name=quantum-metadata-agent
+	dh_installinit
 
 get-orig-source:
 	uscan --verbose --force-download --rename --destdir=../build-area

=== removed directory 'etc'