Merge lp:~james-page/neutron/august-fixes into lp:~ubuntu-server-dev/neutron/havana

[James Page]

Misc fixes - see changelog for details.

[Dave Walker (davewalker)]

LGTM, thanks.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-08-14 13:22:25 +0000
+++ debian/changelog	2013-08-15 09:23:24 +0000
@@ -14,6 +14,10 @@
   [ James Page ]
   * d/*.upstart: Added respawn stanza (LP: #1170393), tidied
     descriptions and rationalized stop on stanzas to be consistent.
+  * d/neutron-dhcp-agent.install: Drop neutron-dhcp-agent-dnsmasq-lease-
+    update inline with upstream.
+  * d/rules: Ignore deprecated quantum binaries when checking for
+    missing files.
 
  -- Chuck Short <[e-mail]>  Wed, 31 Jul 2013 16:55:55 +0000
 

=== modified file 'debian/neutron-dhcp-agent.install'
--- debian/neutron-dhcp-agent.install	2013-07-15 17:45:17 +0000
+++ debian/neutron-dhcp-agent.install	2013-08-15 09:23:24 +0000
@@ -1,5 +1,4 @@
 usr/bin/neutron-dhcp-agent usr/bin
-usr/bin/neutron-dhcp-agent-dnsmasq-lease-update usr/bin
 debian/cron.d/neutron-dhcp-agent-netns-cleanup etc/cron.d
 etc/dhcp_agent.ini etc/neutron
 etc/neutron/rootwrap.d/dhcp.filters etc/neutron/rootwrap.d

=== modified file 'debian/rules'
--- debian/rules	2013-08-01 00:16:10 +0000
+++ debian/rules	2013-08-15 09:23:24 +0000
@@ -7,7 +7,7 @@
 	dh $@  --with python2
 
 override_dh_install:
-	dh_install --fail-missing -X/usr/etc
+	dh_install --fail-missing -X/usr/etc -X/usr/bin/quantum
 
 override_dh_auto_clean:
 	dh_clean