[pkg-dhcp-commits] [SCM] ISC DHCP packaging for Debian branch, master, updated. debian/4.1.0-1-21-g4f2cb4e
Andrew Pollock
apollock at debian.org
Mon Jul 13 05:52:42 UTC 2009
The following commit has been merged in the master branch:
commit 4f2cb4e83f03f148723c4ccaa533b96e10e8b225
Author: Andrew Pollock <apollock at debian.org>
Date: Sun Jul 12 22:24:46 2009 -0700
Concerted purging of all references to "dhcp3"
diff --git a/debian/README.Debian b/debian/README.Debian
index 26260b2..558dcd4 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -33,5 +33,3 @@ previous version of dhcp3-client that was installed.
Eloy A. Paris <peloy at debian.org>
Matt Zimmerman <mdz at debian.org>
Andrew Pollock <apollock at debian.org>
-
-$Id: README.Debian,v 1.1.1.1 2002/05/21 00:07:44 peloy Exp $
diff --git a/debian/debug-enter b/debian/debug-enter
index eb17d72..26564f5 100644
--- a/debian/debug-enter
+++ b/debian/debug-enter
@@ -1,4 +1,3 @@
-# $Id: debug-enter,v 1.2 2003/06/18 18:11:21 peloy Exp $
#
# The purpose of this script is just to show the variables that are
# available to all the scripts in this directory. All these scripts
diff --git a/debian/debug-exit b/debian/debug-exit
index c36d057..9173ac5 100644
--- a/debian/debug-exit
+++ b/debian/debug-exit
@@ -1,4 +1,3 @@
-# $Id: debug-exit,v 1.2 2003/06/18 18:11:21 peloy Exp $
#
# The purpose of this script is just to show the variables that are
# available to all the scripts in this directory. All these scripts
diff --git a/debian/dhcpd.conf b/debian/dhcpd.conf
index 0001c0f..e4368e7 100644
--- a/debian/dhcpd.conf
+++ b/debian/dhcpd.conf
@@ -1,7 +1,6 @@
#
# Sample configuration file for ISC dhcpd for Debian
#
-# $Id: dhcpd.conf,v 1.1.1.1 2002/05/21 00:07:44 peloy Exp $
#
# The ddns-updates-style parameter controls whether or not the server will
diff --git a/debian/isc-dhcp-client.postinst b/debian/isc-dhcp-client.postinst
index 36f1f75..bcc43ab 100644
--- a/debian/isc-dhcp-client.postinst
+++ b/debian/isc-dhcp-client.postinst
@@ -1,6 +1,5 @@
#!/bin/sh -e
#
-# $Id: dhcp3-client.postinst,v 1.1.1.1 2002/05/21 00:07:44 peloy Exp $
#
# Source debconf library.
@@ -16,16 +15,6 @@ case "$1" in
fi
fi
- if dpkg --compare-versions "$2" lt-nl "3.0.4-2"; then
- if [ -e /etc/dhcp3/dhclient-script ]; then
- db_input high dhcp3-client/dhclient-script_moved || true
- db_go
- else
- db_input high dhcp3-client/dhclient-needs-restarting || true
- db_go
- fi
- fi
-
;;
abort-upgrade|abort-remove|abort-deconfigure)
diff --git a/debian/isc-dhcp-client.postrm b/debian/isc-dhcp-client.postrm
index 88d1232..1ac24c3 100644
--- a/debian/isc-dhcp-client.postrm
+++ b/debian/isc-dhcp-client.postrm
@@ -1,6 +1,5 @@
#!/bin/sh -e
#
-# $Id: dhcp3-client.postrm,v 1.1.1.1 2002/05/21 00:07:44 peloy Exp $
#
if [ "$1" = "purge" ]; then
diff --git a/debian/isc-dhcp-relay.config b/debian/isc-dhcp-relay.config
index 539955f..4e0be80 100644
--- a/debian/isc-dhcp-relay.config
+++ b/debian/isc-dhcp-relay.config
@@ -1,30 +1,29 @@
#!/bin/sh -e
#
-# $Id: dhcp3-relay.config,v 1.3 2003/06/18 18:11:21 peloy Exp $
#
# Source debconf library.
. /usr/share/debconf/confmodule
# Read in the current defaults (if available)
-INITCONFFILE=/etc/default/dhcp3-relay
+INITCONFFILE=/etc/default/isc-dhcp-relay
# Read current configuration - the user might not use dpkg-reconfigure
-# to change /etc/default/dhcp3-relay, so we need to do this to
+# to change /etc/default/isc-dhcp-relay, so we need to do this to
# preserve the configuration.
if [ -r ${INITCONFFILE} ]; then
. ${INITCONFFILE}
- db_set dhcp3-relay/servers "${SERVERS}"
- db_set dhcp3-relay/interfaces "${INTERFACES}"
+ db_set isc-dhcp-relay/servers "${SERVERS}"
+ db_set isc-dhcp-relay/interfaces "${INTERFACES}"
fi
db_title "DHCP Relay"
-db_input high dhcp3-relay/servers || true
+db_input high isc-dhcp-relay/servers || true
db_go
-db_input high dhcp3-relay/interfaces || true
+db_input high isc-dhcp-relay/interfaces || true
db_go
-db_input high dhcp3-relay/options || true
+db_input high isc-dhcp-relay/options || true
db_go
diff --git a/debian/isc-dhcp-relay.init.d b/debian/isc-dhcp-relay.init.d
index d092322..6526ba0 100644
--- a/debian/isc-dhcp-relay.init.d
+++ b/debian/isc-dhcp-relay.init.d
@@ -1,10 +1,9 @@
#!/bin/sh
#
-# $Id: dhcp3-relay.init.d,v 1.2 2003/06/18 18:11:21 peloy Exp $
#
### BEGIN INIT INFO
-# Provides: dhcp3-relay
+# Provides: isc-dhcp-relay
# Required-Start: $remote_fs $network
# Required-Stop: $remote_fs $network
# Should-Start: $local_fs
@@ -18,7 +17,7 @@
# It is not safe to start if we don't have a default configuration...
if [ ! -f /etc/default/isc-dhcp-relay ]; then
echo "/etc/default/isc-dhcp-relay does not exist! - Aborting..."
- echo "Run 'dpkg-reconfigure dhcp3-relay' to fix the problem."
+ echo "Run 'dpkg-reconfigure isc-dhcp-relay' to fix the problem."
exit 1
fi
diff --git a/debian/isc-dhcp-relay.postinst b/debian/isc-dhcp-relay.postinst
index c094a22..1c6970e 100644
--- a/debian/isc-dhcp-relay.postinst
+++ b/debian/isc-dhcp-relay.postinst
@@ -1,6 +1,5 @@
#!/bin/sh -e
#
-# $Id: dhcp3-relay.postinst,v 1.4 2003/06/18 18:11:21 peloy Exp $
#
case "$1" in
diff --git a/debian/isc-dhcp-relay.postrm b/debian/isc-dhcp-relay.postrm
index 541a0d2..2ab403d 100644
--- a/debian/isc-dhcp-relay.postrm
+++ b/debian/isc-dhcp-relay.postrm
@@ -1,6 +1,5 @@
#!/bin/sh -e
#
-# $Id: dhcp3-relay.postrm,v 1.2 2004/05/26 17:08:00 peloy Exp $
#
if [ "$1" = "purge" ]; then
diff --git a/debian/isc-dhcp-relay.prerm b/debian/isc-dhcp-relay.prerm
index 9b98515..3640f72 100644
--- a/debian/isc-dhcp-relay.prerm
+++ b/debian/isc-dhcp-relay.prerm
@@ -1,14 +1,8 @@
#!/bin/sh -e
#
-# $Id: dhcp3-relay.prerm,v 1.1.1.1 2002/05/21 00:07:44 peloy Exp $
#
-if ( [ "$1" = "upgrade" ] || [ "$1" = "remove" ] ) && \
- [ -L /usr/doc/dhcp3-relay ]; then
- rm -f /usr/doc/dhcp3-relay
-fi
-
-invoke-rc.d dhcp3-relay stop
+invoke-rc.d isc-dhcp-relay stop
#DEBHELPER#
diff --git a/debian/isc-dhcp-server.config b/debian/isc-dhcp-server.config
index 3923280..412c4b3 100644
--- a/debian/isc-dhcp-server.config
+++ b/debian/isc-dhcp-server.config
@@ -1,34 +1,25 @@
#!/bin/sh -e
#
-# $Id: dhcp3-server.config,v 1.2 2003/01/29 19:49:17 peloy Exp $
#
# Source debconf library.
. /usr/share/debconf/confmodule
# Read in the current defaults (if available)
-INITCONFFILE=/etc/default/dhcp3-server
+INITCONFFILE=/etc/default/isc-dhcp-server
# Read current configuration - the user might not use dpkg-reconfigure
-# to change /etc/default/dhcp3-server, so we need to do this to
+# to change /etc/default/isc-dhcp-server, so we need to do this to
# preserve the configuration.
if [ -r ${INITCONFFILE} ]; then
. ${INITCONFFILE}
- db_set dhcp3-server/interfaces "${INTERFACES}"
+ db_set isc-dhcp-server/interfaces "${INTERFACES}"
fi
db_title "DHCP Server"
-db_input low dhcp3-server/interfaces || true
+db_input low isc-dhcp-server/interfaces || true
db_go
-#db_input high dhcp3-server/config_warn || true
-#db_go
-
-db_input high dhcp3-server/new_auth_behavior || true
+db_input high isc-dhcp-server/new_auth_behavior || true
db_go
-
-if dpkg --compare-versions "$2" lt-nl "3.0.3-4"; then
- db_input high dhcp3-server/new_next-server_behaviour || true
- db_go
-fi
diff --git a/debian/isc-dhcp-server.init.d b/debian/isc-dhcp-server.init.d
index 47771e7..417c8ab 100644
--- a/debian/isc-dhcp-server.init.d
+++ b/debian/isc-dhcp-server.init.d
@@ -1,10 +1,9 @@
#!/bin/sh
#
-# $Id: dhcp3-server.init.d,v 1.4 2003/07/13 19:12:41 mdz Exp $
#
### BEGIN INIT INFO
-# Provides: dhcp3-server
+# Provides: isc-dhcp-server
# Required-Start: $remote_fs $network $syslog
# Required-Stop: $remote_fs $network $syslog
# Should-Start: $local_fs slapd
@@ -21,8 +20,8 @@ test -f /usr/sbin/dhcpd || exit 0
# It is not safe to start if we don't have a default configuration...
if [ ! -f /etc/default/isc-dhcp-server ]; then
- echo "/etc/default/dhcp3-server does not exist! - Aborting..."
- echo "Run 'dpkg-reconfigure dhcp3-server' to fix the problem."
+ echo "/etc/default/isc-dhcp-server does not exist! - Aborting..."
+ echo "Run 'dpkg-reconfigure isc-dhcp-server' to fix the problem."
exit 0
fi
diff --git a/debian/isc-dhcp-server.postinst b/debian/isc-dhcp-server.postinst
index 79b4eb1..d3990ff 100644
--- a/debian/isc-dhcp-server.postinst
+++ b/debian/isc-dhcp-server.postinst
@@ -2,7 +2,6 @@
#
# Inspiration stolen from the fetchmail* packages. Thanks Henrique!
#
-# $Id: dhcp3-server.postinst,v 1.4 2003/12/18 21:29:05 mdz Exp $
#
#DEBHELPER#
@@ -72,25 +71,8 @@ fi
[ -x /sbin/restorecon ] && restorecon /var/lib/dhcp/dhcpd.leases
-# If we're upgrading from something before 3.0.2-1 we need to move
-# the symlinks in /etc/rc?.d because we want to fix #292357 for existing
-# users as well as new users
-if dpkg --compare-versions "$2" lt-nl "3.0.2-1"; then
- for rcdir in /etc/rc?.d
- do
- [ -e ${rcdir}/S20dhcp3-server ] && mv ${rcdir}/S20dhcp3-server ${rcdir}/S40dhcp3-server
- [ -e ${rcdir}/K20dhcp3-server ] && mv ${rcdir}/K20dhcp3-server ${rcdir}/K40dhcp3-server
- done
-fi
-
update-rc.d isc-dhcp-server start 40 2 3 4 5 . stop 40 1 . >/dev/null
-# If we're upgrading from something before 3.1.1-2, we need to remove the
-# shutdown links from /etc/rc{0,6}.d as part of #486518
-if dpkg --compare-versions "$2" lt-nl "3.1.1-2"; then
- rm -f /etc/rc0.d/K40dhcp3-server /etc/rc6.d/K40dhcp3-server
-fi
-
# Init script could fail, since dhcp is unconfigured on a new install
invoke-rc.d isc-dhcp-server start || true
diff --git a/debian/isc-dhcp-server.postrm b/debian/isc-dhcp-server.postrm
index 18ac30e..33ca293 100644
--- a/debian/isc-dhcp-server.postrm
+++ b/debian/isc-dhcp-server.postrm
@@ -1,6 +1,5 @@
#!/bin/sh -e
#
-# $Id: dhcp3-server.postrm,v 1.4 2004/05/26 17:08:00 peloy Exp $
#
case "$1" in
diff --git a/debian/isc-dhcp-server.prerm b/debian/isc-dhcp-server.prerm
index 553a166..b854f4f 100644
--- a/debian/isc-dhcp-server.prerm
+++ b/debian/isc-dhcp-server.prerm
@@ -1,9 +1,8 @@
#!/bin/sh -e
#
-# $Id: dhcp3-server.prerm,v 1.1.1.1 2002/05/21 00:07:44 peloy Exp $
#
-invoke-rc.d dhcp3-server stop
+invoke-rc.d isc-dhcp-server stop
#DEBHELPER#
--
ISC DHCP packaging for Debian
More information about the pkg-dhcp-commits
mailing list