Merge lp:~smoser/ubuntu/quantal/isc-dhcp/maas-lp1049177 into lp:ubuntu/quantal/isc-dhcp

[Scott Moser]

=== modified file 'debian/apparmor-profile.dhcpd'
--- debian/apparmor-profile.dhcpd	2012-07-03 09:54:00 +0000
+++ debian/apparmor-profile.dhcpd	2012-09-11 19:31:20 +0000
@@ -60,6 +60,9 @@
   # (for dhcpd to access).
   /etc/dhcp/ddns-keys/** r,
 
+  # allow packages to re-use dhcpd and provide their own specific directories
+  #include <dhcpd.d>
+
   # Site-specific additions and overrides. See local/README for details.
   #include <local/usr.sbin.dhcpd>
 }
 
=== modified file 'debian/changelog'
--- debian/changelog	2012-09-05 08:59:49 +0000
+++ debian/changelog	2012-09-11 19:31:20 +0000
@@ -1,3 +1,10 @@
+isc-dhcp (4.2.4-1ubuntu8) UNRELEASED; urgency=low
+
+  * debian/apparmor-profile.dhcpd: use include directory to enable
+    other packages to re-use isc-dhcp-server. (LP: #1049177)
+
+ -- Scott Moser <[e-mail]>  Tue, 11 Sep 2012 11:07:52 -0400
+
 isc-dhcp (4.2.4-1ubuntu7) quantal-proposed; urgency=low
 
   * debian/dhclient-script.linux: Explicitly set the PATH to that of
 
=== modified file 'debian/isc-dhcp-server.install'
--- debian/isc-dhcp-server.install	2010-11-09 17:40:49 +0000
+++ debian/isc-dhcp-server.install	2012-09-11 19:31:20 +0000
@@ -4,3 +4,4 @@
 usr/sbin/dhcpd
 etc/dhcp/dhcpd.conf
 etc/apparmor.d/usr.sbin.dhcpd
+etc/apparmor.d/dhcpd.d
 
=== modified file 'debian/rules'
--- debian/rules	2012-07-03 09:54:00 +0000
+++ debian/rules	2012-09-11 19:31:20 +0000
@@ -108,6 +108,7 @@
 
 	# Install apparmor profile
 	mkdir -p $(DESTDIR)/etc/apparmor.d
+	mkdir -p $(DESTDIR)/etc/apparmor.d/dhcpd.d
 	$(INSTALL_FILE) debian/apparmor-profile.dhcpd $(DESTDIR)/etc/apparmor.d/usr.sbin.dhcpd
 	$(INSTALL_FILE) debian/apparmor-profile.dhclient $(DESTDIR)/etc/apparmor.d/sbin.dhclient