diff options
| author | Guillem Jover <guillem@debian.org> | 2004-09-29 17:31:13 +0000 |
|---|---|---|
| committer | Guillem Jover <guillem@hadrons.org> | 2010-06-10 23:21:16 +0200 |
| commit | e87d2585df0779baa704dce60ee18cd8708b59a5 (patch) | |
| tree | 9cf96f95c1e0a20d76fac9f7e464e3336a08ff2c | |
| parent | ace77b67fa6788ef34ee38b0b8d5c8501331cfa0 (diff) | |
| download | inetutils-e87d2585df0779baa704dce60ee18cd8708b59a5.tar.gz | |
Only install ping6 on IPv6 enabled systems
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | debian/inetutils-ping.install | 1 | ||||
| -rw-r--r-- | debian/inetutils-ping.install.hurd-i386 | 1 | ||||
| -rwxr-xr-x | debian/rules | 8 |
4 files changed, 7 insertions, 10 deletions
diff --git a/debian/changelog b/debian/changelog index 5520cb4..a03a911 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,10 +13,9 @@ inetutils (2:1.4.2+20040207-@unreleased@) unstable; urgency=low - rules [ Guillem Jover ] - * Do not install ping6 on the Hurd, was causing a FTFBS. Should be enabled - again once it haves IPv6 support. (Closes: #273962) - - debian/inetutils-ping.install.hurd-i386: New file. - - debian/rules: Conditionally move ping6 to /bin. + * Do not install ping6 on systems not supporting IPv6. (Closes: #273962) + - debian/inetutils-ping.install: Do not install ping6, that is handled ... + - debian/rules: ... here. If ping6 is found install it 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/inetutils-ping.install b/debian/inetutils-ping.install index b9b3272..15b5dc8 100644 --- a/debian/inetutils-ping.install +++ b/debian/inetutils-ping.install @@ -1,2 +1 @@ debian/tmp/bin/ping -debian/tmp/bin/ping6 diff --git a/debian/inetutils-ping.install.hurd-i386 b/debian/inetutils-ping.install.hurd-i386 deleted file mode 100644 index 15b5dc8..0000000 --- a/debian/inetutils-ping.install.hurd-i386 +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/bin/ping diff --git a/debian/rules b/debian/rules index 8d5a927..682ccd2 100755 --- a/debian/rules +++ b/debian/rules @@ -45,10 +45,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 + if [ -x $(CURDIR)/debian/tmp/usr/bin/ping6 ]; then \ + mv $(CURDIR)/debian/tmp/usr/bin/ping6 \ + $(CURDIR)/debian/$(cdbs_curpkg)/bin/ \ + fi # Rename ifconfig to not break existing systems using net-tools install/inetutils-tools :: |