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

[Andrew Pollock]

The following commit has been merged in the master branch:
commit 55886c38ea6495efd8b8f5682828eb640b764bc3
Author: Andrew Pollock <apollock at icarus.andrew.net.au>
Date:   Sun Jul 12 22:05:06 2009 -0700

    Fix debconf key values to match new package names

diff --git a/debian/isc-dhcp-client.templates b/debian/isc-dhcp-client.templates
deleted file mode 100644
index 029ea4d..0000000
--- a/debian/isc-dhcp-client.templates
+++ /dev/null
@@ -1,32 +0,0 @@
-# These templates have been reviewed by the debian-l10n-english
-# team
-#
-# If modifications/additions/rewording are needed, please ask
-# for an advice to debian-l10n-english at lists.debian.org
-#
-# Even minor modifications require translation updates and such
-# changes should be coordinated with translators and reviewers.
-
-# Should probably be dropped
-Template: dhcp3-client/dhclient-script_moved
-Type: note
-_Description: dhclient-script moved
- As of 3.0.4-2, dhclient-script is installed in /sbin and is no longer
- registered as a configuration file. /etc/dhcp3/dhclient-script
- appears to have been modified at some point, so it has not been
- removed. However it is no longer being used.
- .
- Please consider using the hook infrastructure (see dhclient-script(8)
- for more information) instead of modifying dhclient-script.
-
-# Should probably be dropped
-Template: dhcp3-client/dhclient-needs-restarting
-Type: note
-_Description: dhclient needs restarting
- As always, dhclient is not restarted on upgrade, so you are still running the
- previous version of dhclient. You can restart it by doing an ifdown and ifup
- on the interface(s) that are configured to use DHCP, or by explicitly killing
- and restarting dhclient.
- .
- Naturally, you should exercise caution if you are managing a remote server via
- an interface using DHCP.
diff --git a/debian/isc-dhcp-relay.templates b/debian/isc-dhcp-relay.templates
index 749904f..79a1742 100644
--- a/debian/isc-dhcp-relay.templates
+++ b/debian/isc-dhcp-relay.templates
@@ -7,7 +7,7 @@
 # Even minor modifications require translation updates and such
 # changes should be coordinated with translators and reviewers.
 
-Template: dhcp3-relay/servers
+Template: isc-dhcp-relay/servers
 Type: string
 _Description: Servers the DHCP relay should forward requests to:
  Please enter the hostname or IP address of at least one DHCP server
@@ -16,7 +16,7 @@ _Description: Servers the DHCP relay should forward requests to:
  You can specify multiple server names or IP addresses (in a
  space-separated list).
 
-Template: dhcp3-relay/interfaces
+Template: isc-dhcp-relay/interfaces
 Type: string
 _Description: Interfaces the DHCP relay should listen on:
  Please specify which network interface(s) the DHCP relay should
@@ -27,7 +27,7 @@ _Description: Interfaces the DHCP relay should listen on:
  configuration of network interfaces by the DHCP relay, in which case
  only broadcast interfaces will be used (if possible).
 
-Template: dhcp3-relay/options
+Template: isc-dhcp-relay/options
 Type: string
 _Description: Additional options for the DHCP relay daemon:
  Please specify any additional options for the DHCP relay daemon.
diff --git a/debian/isc-dhcp-server.templates b/debian/isc-dhcp-server.templates
index 3ee0eb1..391f3d9 100644
--- a/debian/isc-dhcp-server.templates
+++ b/debian/isc-dhcp-server.templates
@@ -7,7 +7,7 @@
 # Even minor modifications require translation updates and such
 # changes should be coordinated with translators and reviewers.
 
-Template: dhcp3-server/config_warn
+Template: isc-dhcp-server/config_warn
 Type: note
 _Description: Manual configuration required after installation
  After the DHCP server is installed, you will need to manually configure it
@@ -16,7 +16,7 @@ _Description: Manual configuration required after installation
  .
  Please configure the DHCP server as soon as the installation finishes.
 
-Template: dhcp3-server/interfaces
+Template: isc-dhcp-server/interfaces
 Type: string
 _Description: Network interfaces on which the DHCP server should listen:
  Please specify on which network interface(s) the DHCP server should
@@ -25,27 +25,3 @@ _Description: Network interfaces on which the DHCP server should listen:
  .
  The interfaces will be automatically detected if this field is left
  blank.
-
-# Should probably be dropped
-Template: dhcp3-server/new_auth_behavior
-Type: note
-_Description: Non-authoritative version of DHCP server
- The version 3 DHCP server is non-authoritative by default.
- .
- This means that if a client requests an address that the server knows
- nothing about and the address is incorrect for that network segment, the
- server will _not_ send a DHCPNAK (which tells the client it should stop
- using the address). If you want to change this behavior, you must
- explicitly state in dhcpd.conf what network segments your server is
- authoritative for using the 'authoritative' statement.
-
-# Should probably be dropped
-Template: dhcp3-server/new_next-server_behaviour
-Type: note
-_Description: Change in default behaviour of the next-server directive
- From version 3.0.3, the DHCP server's default value of the
- next-server directive has changed. If you are network booting clients, and
- your TFTP server is your DHCP server, you need to explicitly set a
- next-server directive to state this. Please see
- /usr/share/doc/dhcp3-server/NEWS.Debian.gz and
- /usr/share/doc/dhcp3-common/RELNOTES.gz for more information.

-- 
ISC DHCP packaging for Debian