[pkg-dhcp-commits] [SCM] ISC DHCP packaging for Debian branch, master, updated. debian/4.1.1-P1-16.1-32-g99e5109

[Andrew Pollock]

The following commit has been merged in the master branch:
commit 99e510900dcc8382408b5cea98340acfdd68f82c
Author: Andrew Pollock <apollock at debian.org>
Date:   Sat Aug 27 13:47:26 2011 -0700

    isc-dhcp-server.postinst: fix comment in /etc/default/isc-dhcp-server
    
    Change comments in /etc/default/isc-dhcp-server so that they refer correctly
        to /etc/init.d/isc-dhcp-server.
    
        This should fix bug #616417
    
    Patch from Peter Marschall

diff --git a/debian/changelog b/debian/changelog
index 08cc45e..46bed18 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,8 +27,10 @@ isc-dhcp (4.2.2-1) unstable; urgency=low
   * debian/isc-dhcp-client,dhcp3-client}.links: apply patch from Peter
     Marschall to move old compatibility links to the old compatibility package
     (closes: #614992)
+  * debian/isc-dhcp-server.postinst: apply patch from Peter Marschall to fix
+    comment in /etc/default/isc-dhcp-server (closes: #616417)
 
- -- Andrew Pollock <apollock at debian.org>  Sat, 27 Aug 2011 13:41:23 -0700
+ -- Andrew Pollock <apollock at debian.org>  Sat, 27 Aug 2011 13:46:16 -0700
 
 isc-dhcp (4.1.1-P1-18) unstable; urgency=low
 
diff --git a/debian/isc-dhcp-server.postinst b/debian/isc-dhcp-server.postinst
index 126009f..cd326d5 100644
--- a/debian/isc-dhcp-server.postinst
+++ b/debian/isc-dhcp-server.postinst
@@ -34,8 +34,8 @@ umask 022
 [ -r "${INITCONFFILE}" ] || {
 	echo Generating ${INITCONFFILE}... >&2
 	cat >${INITCONFFILE} <<'EOFMAGICNUMBER1234'
-# Defaults for dhcp initscript
-# sourced by /etc/init.d/dhcp
+# Defaults for isc-dhcp-server initscript
+# sourced by /etc/init.d/isc-dhcp-server
 # installed at /etc/default/isc-dhcp-server by the maintainer scripts
 
 #

-- 
ISC DHCP packaging for Debian