Move dhcp exit hooks

git-svn-id: svn://svn.debian.org/pkg-ntp/ntp/trunk@318 0070b5ef-2f16-0410-befa-9a02bd1d6ddb

9 files changed, 54 insertions, 3 deletions

diff --git a/debian/changelog b/debian/changelog
index 96bf4fe..a1919bc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,19 @@
 ntp (1:4.2.6.p1+dfsg-2) UNRELEASED; urgency=low
 
+  [ Peter Eisentraut ]
   * Update command options section in ntp.conf(5) man page, drop "dynamic"
     option (closes: #553976, #439734)
   * Document ntpd -I option and ntp.conf interface command (closes: #506389)
   * Fix type in ntpdate man page (closes: #566621)
   * Added explanation of options to ntptrace man page (closes: #558289)
 
- -- Peter Eisentraut <petere@debian.org>  Fri, 02 Jul 2010 23:54:22 -0400
+  [ Kurt Roeckx ]
+  * Move dhcp exit hooks from /etc/dhcp3/dhclient-enter-hooks.d to
+    /etc/dhcp/dhclient-enter-hooks.d.  Add dpkg-maintscript-helper
+    to maintainer scripts to move them, and add a Breaks on
+    dhcp3-client (<< 4.1.0-1) (Closes: #585054, #585055)
+
+ -- Kurt Roeckx <kurt@roeckx.be>  Sat, 03 Jul 2010 17:38:31 +0200
 
 ntp (1:4.2.6.p1+dfsg-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 4dfd545..5ac79c8 100644
--- a/debian/control
+++ b/debian/control
@@ -17,6 +17,7 @@ Pre-Depends: dpkg (>= 1.15.7.2)
 Recommends: ${perl:Depends}
 Suggests: ntp-doc
 Replaces: logcheck-database
+Breaks: dhcp3-client (<< 4.1.0-1)
 Description: Network Time Protocol daemon and utility programs
  NTP, the Network Time Protocol, is used to keep computer clocks
  accurate by synchronizing them over the Internet or a local network,
@@ -36,6 +37,7 @@ Architecture: any
 Depends: netbase, ${misc:Depends}, ${shlibs:Depends}
 Pre-Depends: dpkg (>= 1.15.7.2)
 Recommends: lockfile-progs
+Breaks: dhcp3-client (<< 4.1.0-1)
 Description: client for setting system time from NTP servers
  NTP, the Network Time Protocol, is used to keep computer clocks
  accurate by synchronizing them over the Internet or a local network,
diff --git a/debian/ntp.postinst b/debian/ntp.postinst
index 1ea3768..cfe8c62 100644
--- a/debian/ntp.postinst
+++ b/debian/ntp.postinst
@@ -11,6 +11,13 @@ if dpkg-maintscript-helper supports rm_conffile; then
 		/etc/network/if-up.d/ntp 1:4.2.6+dfsg-1 -- "$@"
 fi
 
+if dpkg-maintscript-helper supports mv_conffile; then
+	dpkg-maintscript-helper mv_conffile \
+		/etc/dhcp3/dhclient-exit-hooks.d/ntp \
+		/etc/dhcp/dhclient-exit-hooks.d/ntp \
+		1:4.2.6.p1+dfsg-1 -- "$@"
+fi
+
 if [ "$1" = "configure" ]; then
 	adduser --system --quiet --group --no-create-home ntp || :
 	chown -R ntp:ntp /var/lib/ntp /var/log/ntpstats
diff --git a/debian/ntp.postrm b/debian/ntp.postrm
index 9e11aff..d959aa5 100644
--- a/debian/ntp.postrm
+++ b/debian/ntp.postrm
@@ -11,6 +11,13 @@ if dpkg-maintscript-helper supports rm_conffile; then
 		/etc/network/if-up.d/ntp 1:4.2.6+dfsg-1 -- "$@"
 fi
 
+if dpkg-maintscript-helper supports mv_conffile; then
+	dpkg-maintscript-helper mv_conffile \
+		/etc/dhcp3/dhclient-exit-hooks.d/ntp \
+		/etc/dhcp/dhclient-exit-hooks.d/ntp \
+		1:4.2.6.p1+dfsg-1 -- "$@"
+fi
+
 installinit_error() {
 	exit $?
 }
diff --git a/debian/ntp.preinst b/debian/ntp.preinst
index ac3adc4..3c9f0a0 100644
--- a/debian/ntp.preinst
+++ b/debian/ntp.preinst
@@ -11,5 +11,12 @@ if dpkg-maintscript-helper supports rm_conffile; then
 		/etc/network/if-up.d/ntp 1:4.2.6+dfsg-1 -- "$@"
 fi
 
+if dpkg-maintscript-helper supports mv_conffile; then
+	dpkg-maintscript-helper mv_conffile \
+		/etc/dhcp3/dhclient-exit-hooks.d/ntp \
+		/etc/dhcp/dhclient-exit-hooks.d/ntp \
+		1:4.2.6.p1+dfsg-1 -- "$@"
+fi
+
 #DEBHELPER#
 
diff --git a/debian/ntpdate.postinst b/debian/ntpdate.postinst
index ca7c985..3ecc178 100644
--- a/debian/ntpdate.postinst
+++ b/debian/ntpdate.postinst
@@ -7,5 +7,12 @@ if dpkg-maintscript-helper supports rm_conffile; then
 		/etc/dhcp3/dhclient-enter-hooks.d/ntpdate 1:4.2.6+dfsg-1 -- "$@"
 fi
 
+if dpkg-maintscript-helper supports mv_conffile; then
+	dpkg-maintscript-helper mv_conffile \
+		/etc/dhcp3/dhclient-exit-hooks.d/ntpdate \
+		/etc/dhcp/dhclient-exit-hooks.d/ntpdate \
+		1:4.2.6.p1+dfsg-1 -- "$@"
+fi
+
 #DEBHELPER#
 
diff --git a/debian/ntpdate.postrm b/debian/ntpdate.postrm
index 025fd6e..60b6e6a 100644
--- a/debian/ntpdate.postrm
+++ b/debian/ntpdate.postrm
@@ -7,6 +7,13 @@ if dpkg-maintscript-helper supports rm_conffile; then
 		/etc/dhcp3/dhclient-enter-hooks.d/ntpdate 1:4.2.6+dfsg-1 -- "$@"
 fi
 
+if dpkg-maintscript-helper supports mv_conffile; then
+	dpkg-maintscript-helper mv_conffile \
+	/etc/dhcp3/dhclient-exit-hooks.d/ntpdate \
+	/etc/dhcp/dhclient-exit-hooks.d/ntpdate \
+	1:4.2.6.p1+dfsg-1 -- "$@"
+fi
+
 #DEBHELPER#
 
 if [ "$1" = "purge" ]; then
diff --git a/debian/ntpdate.preinst b/debian/ntpdate.preinst
index ca7c985..3ecc178 100644
--- a/debian/ntpdate.preinst
+++ b/debian/ntpdate.preinst
@@ -7,5 +7,12 @@ if dpkg-maintscript-helper supports rm_conffile; then
 		/etc/dhcp3/dhclient-enter-hooks.d/ntpdate 1:4.2.6+dfsg-1 -- "$@"
 fi
 
+if dpkg-maintscript-helper supports mv_conffile; then
+	dpkg-maintscript-helper mv_conffile \
+		/etc/dhcp3/dhclient-exit-hooks.d/ntpdate \
+		/etc/dhcp/dhclient-exit-hooks.d/ntpdate \
+		1:4.2.6.p1+dfsg-1 -- "$@"
+fi
+
 #DEBHELPER#
 
diff --git a/debian/rules b/debian/rules
index 3e43a8f..d9a8e77 100755
--- a/debian/rules
+++ b/debian/rules
@@ -61,8 +61,8 @@ install: build-stamp
 	done
 
 	install -D -m 0755 scripts/ntpsweep debian/ntp/usr/bin/ntpsweep
-	install -D -m 0644 debian/ntp.dhcp debian/ntp/etc/dhcp3/dhclient-exit-hooks.d/ntp
-	install -D -m 0644 debian/ntpdate.dhcp debian/ntpdate/etc/dhcp3/dhclient-exit-hooks.d/ntpdate
+	install -D -m 0644 debian/ntp.dhcp debian/ntp/etc/dhcp/dhclient-exit-hooks.d/ntp
+	install -D -m 0644 debian/ntpdate.dhcp debian/ntpdate/etc/dhcp/dhclient-exit-hooks.d/ntpdate
 	install -D -m 0755 debian/ntpdate-debian debian/ntpdate/usr/sbin/ntpdate-debian
 
 	install -D -m 0644 debian/ntp.conf debian/ntp/etc/ntp.conf