summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuillem Jover <guillem@debian.org>2004-09-29 13:09:25 +0000
committerGuillem Jover <guillem@hadrons.org>2010-06-10 23:21:16 +0200
commitca066fa5df686350932dfd75e9f593e6b62f814b (patch)
tree6d48074487631287a2fa87f362c812208c24122d
parent6681494420fd86c233119df86aa66af77e495819 (diff)
downloadinetutils-ca066fa5df686350932dfd75e9f593e6b62f814b.tar.gz
Conditionally move on non-Hurd systems ping6 to /bin
-rw-r--r--debian/changelog1
-rwxr-xr-xdebian/rules3
2 files changed, 4 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index e7b894f..53c677a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,7 @@ inetutils (2:1.4.2+20040207-@unreleased@) unstable; urgency=low
* Do not install ping6 on the Hurd, was causing a FTFBS. Should be enabled
again once it haves IPv6 support.
- debian/inetutils-ping.install.hurd-i386: New file.
+ - debian/rules: Conditionally move ping6 to /bin.
* Clean the net-tools Provides generation.
- debian/control.in: Delete the line instead of replacing with a token to
be greped out later.
diff --git a/debian/rules b/debian/rules
index ea07a63..9a6e1d7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -42,7 +42,10 @@ endif
install/inetutils-ping ::
mkdir debian/tmp/bin
mv debian/tmp/usr/bin/ping debian/tmp/bin/
+# XXX: This should be removed once the Hurd has IPv6 support
+ifneq ($(DEB_HOST_GNU_SYSTEM),gnu)
mv debian/tmp/usr/bin/ping6 debian/tmp/bin/
+endif
# Rename ifconfig to not break existing systems using net-tools
install/inetutils-tools ::