[pkg-dhcp-commits] [SCM] ISC DHCP packaging for Debian branch, master, updated. debian/4.1.0-1-30-g5befac9

[Andrew Pollock]

The following commit has been merged in the master branch:
commit b846650d4c58a269738b21388e652752948545d5
Author: Andrew Pollock <apollock at debian.org>
Date:   Sun Aug 30 16:59:12 2009 -0700

    Transfer the existing dhcp3-server config file if upgrading from dhcp3-server

diff --git a/debian/changelog b/debian/changelog
index 27eb21a..107f454 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,8 +10,9 @@ isc-dhcp (4.1.0-1) unstable; urgency=low
   * add transitional packages
   * add debian/README.source
   * debian/control: bumped Standards-Version
+  * debian/isc-dhcp-server.postinst: transfer existing config file when upgrading from dhcp3-server
 
- -- Andrew Pollock <apollock at debian.org>  Thu, 20 Aug 2009 00:32:54 -0700
+ -- Andrew Pollock <apollock at debian.org>  Sun, 30 Aug 2009 16:58:49 -0700
 
 dhcp3 (3.1.2-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 441f6cb..c4b4b23 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Provides: dhcp3-server
 Conflicts: dhcp, dhcp3-server
 Replaces: dhcp3-server
 Suggests: isc-dhcp-server-ldap
-Description: DHCP server for automatic IP address assignment
+Description: ISC DHCP server for automatic IP address assignment
  This is the server from the Internet Software Consortium's implementation of
  DHCP. For more information, visit http://www.isc.org.
  .
@@ -32,7 +32,7 @@ Architecture: any
 Depends: debianutils (>= 2.8.2), isc-dhcp-common (= ${binary:Version}), lsb-base, ${shlibs:Depends}, ${misc:Depends}
 Conflicts: dhcp
 Suggests: isc-dhcp-server-ldap
-Description: DHCP server for automatic IP address assignment (debug)
+Description: ISC DHCP server for automatic IP address assignment (debug)
  This is the server from the Internet Software Consortium's implementation of
  DHCP. For more information, visit http://www.isc.org.
  .
@@ -134,7 +134,7 @@ Architecture: any
 Section: debian-installer
 Depends: ${shlibs:Depends}
 XC-Package-Type: udeb
-Description: DHCP Client for debian-installer
+Description: ISC DHCP Client for debian-installer
  dhcp-client-udeb is a minimal dhcp package used by the debian-installer.
 
 Package: isc-dhcp-relay
@@ -144,7 +144,7 @@ Depends: debianutils (>= 2.8.2), isc-dhcp-common (= ${binary:Version}), ${shlibs
 Provides: dhcp3-relay
 Conflicts: dhcp-relay, dhcp3-relay
 Replaces: dhcp3-relay
-Description: DHCP relay daemon
+Description: ISC DHCP relay daemon
  This is the relay from the Internet Software Consortium's implementation of
  DHCP. For more information visit
  http://www.isc.org.
diff --git a/debian/isc-dhcp-server.postinst b/debian/isc-dhcp-server.postinst
index d3990ff..e46df20 100644
--- a/debian/isc-dhcp-server.postinst
+++ b/debian/isc-dhcp-server.postinst
@@ -69,6 +69,11 @@ if [ ! -e /var/lib/dhcp/dhcpd.leases ]; then
     fi
 fi
 
+# If we're upgrading from dhcp3, copy /etc/dhcp3/dhcpd.conf to /etc/dhcp
+if [ -z "$2" ] && [ -f /etc/dhcp3/dhcpd.conf ]; then
+	cp /etc/dhcp3/dhcpd.conf /etc/dhcp/dhcpd.conf
+fi
+
 [ -x /sbin/restorecon ] && restorecon /var/lib/dhcp/dhcpd.leases
 
 update-rc.d isc-dhcp-server start 40 2 3 4 5 . stop 40 1 . >/dev/null

-- 
ISC DHCP packaging for Debian