Move the dhcp client hook from /etc/dhcp3 to /etc/dhcp. Closes: #649100.

7 files changed, 17 insertions, 5 deletions

diff --git a/debian/changelog b/debian/changelog
index 12600eb3c4..790af2c9ee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,8 @@ samba (2:4.1.4+dfsg-2) UNRELEASED; urgency=medium
   [ Steve Langasek ]
   * dhcp3-client is superseded by dhcp-client; update the references in
     the package.  Closes: #736070.
+  * Move the dhcp client hook from /etc/dhcp3 to /etc/dhcp.
+    Closes: #649100.
 
  -- Jelmer Vernooij <jelmer@debian.org>  Sat, 18 Jan 2014 20:26:35 +0000
 
diff --git a/debian/rules b/debian/rules
index 6b8b9b97be..c2f4324393 100755
--- a/debian/rules
+++ b/debian/rules
@@ -128,8 +128,8 @@ override_dh_install:
 	cp debian/smb.conf* $(DESTDIR)/usr/share/samba/
 	install -m755 debian/panic-action $(DESTDIR)/usr/share/samba/panic-action
 	cp debian/gdbcommands $(DESTDIR)/etc/samba/
-	mkdir -p $(DESTDIR)/etc/dhcp3/dhclient-enter-hooks.d
-	install -m755 debian/samba-common.dhcp $(DESTDIR)/etc/dhcp3/dhclient-enter-hooks.d/samba
+	mkdir -p $(DESTDIR)/etc/dhcp/dhclient-enter-hooks.d
+	install -m755 debian/samba-common.dhcp $(DESTDIR)/etc/dhcp/dhclient-enter-hooks.d/samba
 	# Install other stuff not installed by "make install"
 	install -m 0755 debian/mksmbpasswd.awk $(DESTDIR)/usr/sbin/mksmbpasswd
 	dh_install --sourcedir=$(DESTDIR) --list-missing --fail-missing
diff --git a/debian/samba-common.dirs b/debian/samba-common.dirs
index 701f4fffa4..7274aeac51 100644
--- a/debian/samba-common.dirs
+++ b/debian/samba-common.dirs
@@ -1,5 +1,4 @@
 etc/samba
-etc/dhcp3/dhclient-enter-hooks.d
 var/cache/samba
 var/lib/samba
 var/log/samba
diff --git a/debian/samba-common.install b/debian/samba-common.install
index 3b12f62cd8..c9030bac46 100644
--- a/debian/samba-common.install
+++ b/debian/samba-common.install
@@ -1,4 +1,4 @@
-etc/dhcp3/
+etc/dhcp/
 etc/samba/
 etc/samba/gdbcommands
 usr/share/samba/codepages/*.dat
diff --git a/debian/samba-common.links b/debian/samba-common.links
deleted file mode 100644
index c16e55b07b..0000000000
--- a/debian/samba-common.links
+++ /dev/null
@@ -1 +0,0 @@
-etc/dhcp3/dhclient-enter-hooks.d/samba etc/dhcp/dhclient-enter-hooks.d/samba
diff --git a/debian/samba-common.maintscript b/debian/samba-common.maintscript
new file mode 100644
index 0000000000..82d329c076
--- /dev/null
+++ b/debian/samba-common.maintscript
@@ -0,0 +1 @@
+mv_conffile /etc/dhcp3/dhclient-enter-hooks.d/samba /etc/dhcp/dhclient-enter-hooks.d/samba 2:4.1.4+dfsg-2~
diff --git a/debian/samba-common.preinst b/debian/samba-common.preinst
new file mode 100644
index 0000000000..c3118978cc
--- /dev/null
+++ b/debian/samba-common.preinst
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+set -e
+
+if [ $(readlink -f /etc/dhcp/dhclient-enter-hooks.d/samba) = /etc/dhcp3/dhclient-enter-hooks.d/samba ] \
+   && dpkg --compare-versions "$1" le-nl 2:4.1.4+dfsg-2~
+then
+	rm -f /etc/dhcp/dhclient-enter-hooks.d/samba
+fi
+
+#DEBHELPER#