tags 585058 + patch
tags 585058 + pending
thanks
Dear maintainer,
I've prepared an NMU for whereami (versioned as 0.3.34-0.3) and
uploaded it to DELAYED/5. Please feel free to tell me if I
should delay it longer.
This is part of the ongoing DHCPv4 transition.
Regards.
--
Mehdi Dogguy
diff -Nru whereami-0.3.34/debian/changelog whereami-0.3.34/debian/changelog
--- whereami-0.3.34/debian/changelog 2009-09-13 13:55:50.000000000 +0200
+++ whereami-0.3.34/debian/changelog 2010-07-08 16:07:45.000000000 +0200
@@ -1,3 +1,10 @@
+whereami (0.3.34-0.3) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Compatibility with isc-dhcp-client (Closes: #585058).
+
+ -- Mehdi Dogguy <me...@debian.org> Thu, 08 Jul 2010 00:41:36 +0200
+
whereami (0.3.34-0.2) unstable; urgency=low
* Non-maintainer upload to fix release goal.
diff -Nru whereami-0.3.34/debian/control whereami-0.3.34/debian/control
--- whereami-0.3.34/debian/control 2009-09-13 13:55:19.000000000 +0200
+++ whereami-0.3.34/debian/control 2010-07-08 16:07:45.000000000 +0200
@@ -10,7 +10,7 @@
Architecture: all
Suggests: pcmcia-cs, fping, net-tools, ifplugd, ethtool, squid | oops
Recommends: wireless-tools, resolvconf, iputils-arping
-Depends: ${misc:Depends}, perl, fping | iputils-ping | netbase | dhcp-client
+Depends: ${misc:Depends}, perl, fping | iputils-ping | netbase | dhcp-client | isc-dhcp-client
Description: Automatically reconfigure your (laptop) system for a new location
whereami is a set of useful scripts and a coordinating system for
automatically re-locating your computer within the current (network)
diff -Nru whereami-0.3.34/debian/rules whereami-0.3.34/debian/rules
--- whereami-0.3.34/debian/rules 2009-09-13 13:54:08.000000000 +0200
+++ whereami-0.3.34/debian/rules 2010-07-08 16:07:45.000000000 +0200
@@ -36,6 +36,7 @@
dh_installdirs DEBIAN etc etc/init.d etc/$(package) \
etc/$(package) etc/apm etc/apm/scripts.d \
etc/apm/suspend.d etc/apm/resume.d \
+ etc/dhcp etc/dhcp/dhclient-exit-hooks.d \
etc/dhcp3 etc/dhcp3/dhclient-exit-hooks.d \
etc/network etc/network/if-up.d \
etc/network/if-pre-up.d \
@@ -59,6 +60,7 @@
cd debian/$(package)/etc/apm/suspend.d; ln -s ../scripts.d/$(package) 01$(package)
cd debian/$(package)/etc/apm/resume.d; ln -s ../scripts.d/$(package) 99$(package)
install -m644 whereami.conf mail-relay.conf apm.conf detect.conf debian/$(package)/etc/$(package)/.
+ install -m755 debian/whereami.dhclient3-exit-hook debian/$(package)/etc/dhcp/dhclient-exit-hooks.d/whereami
install -m755 debian/whereami.dhclient3-exit-hook debian/$(package)/etc/dhcp3/dhclient-exit-hooks.d/whereami
install -m755 debian/whereami.network-hook debian/$(package)/etc/network/if-pre-up.d/whereami
# If we want to run other than in "pre-up" then we should include something like this. At this stage just "pre-up" seems right-ish...
diff -Nru whereami-0.3.34/debian/whereami.dhclient3-exit-hook whereami-0.3.34/debian/whereami.dhclient3-exit-hook
--- whereami-0.3.34/debian/whereami.dhclient3-exit-hook 2007-05-09 05:44:29.000000000 +0200
+++ whereami-0.3.34/debian/whereami.dhclient3-exit-hook 2010-07-08 16:07:45.000000000 +0200
@@ -12,7 +12,7 @@
# Just exit if whereami is no longer installed
test ! -e /usr/sbin/whereami && exit 1
-statefile=${STATEDIR:-"/var/lib/whereami"}/dhclient3.$interface
+statefile=${STATEDIR:-"/var/lib/whereami"}/dhclient.$interface
# save state to file
(
@@ -28,7 +28,7 @@
case "$reason" in
REBOOT|BOUND)
- /usr/sbin/whereami --run_from dhclient3 --syslog --hint dhclient3
+ /usr/sbin/whereami --run_from dhclient --syslog --hint dhclient
;;
esac
