diff options
| author | Igor Pashev <pashev.igor@gmail.com> | 2013-05-11 18:20:36 +0400 |
|---|---|---|
| committer | Igor Pashev <pashev.igor@gmail.com> | 2013-05-11 18:20:36 +0400 |
| commit | 6f44c9dc16cb2fb94c2150ffaeeedff419b9063e (patch) | |
| tree | 25949ae02014136daba13341bda76cd14060cfac | |
| parent | 00e7ebeaad815dc37b4af78627d2091fffd1e495 (diff) | |
| download | inetutils-6f44c9dc16cb2fb94c2150ffaeeedff419b9063e.tar.gz | |
inetutils (2:1.9-2+dyson1) unstable; urgency=low
* syslogd has standard priority on illumos
* No talk and talkd on illumos libc (missing talkd.h)
* Use POSIX signal functions
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | debian/control.in | 4 | ||||
| -rwxr-xr-x | debian/rules | 6 |
3 files changed, 9 insertions, 7 deletions
diff --git a/debian/changelog b/debian/changelog index 456bc10..4e37aca 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,10 @@ -inetutils (2:1.9-2+dyson1) UNRELEASED; urgency=low +inetutils (2:1.9-2+dyson1) unstable; urgency=low * syslogd has standard priority on illumos + * No talk and talkd on illumos libc (missing talkd.h) + * Use POSIX signal functions - -- Igor Pashev <pashev.igor@gmail.com> Fri, 10 May 2013 19:27:10 +0400 + -- Igor Pashev <pashev.igor@gmail.com> Sat, 11 May 2013 17:00:30 +0400 inetutils (2:1.9-2) unstable; urgency=medium diff --git a/debian/control.in b/debian/control.in index 728dd41..6c90b0c 100644 --- a/debian/control.in +++ b/debian/control.in @@ -82,7 +82,7 @@ Description: system logging daemon Package: inetutils-talk Priority: @inetutils:Priority@ -Architecture: any +Architecture: linux-any hurd-any kfreebsd-any Provides: talk Replaces: talk-hurd Depends: ${shlibs:Depends}, ${misc:Depends}, netbase @@ -92,7 +92,7 @@ Description: talk to another user Package: inetutils-talkd Priority: @inetutils:Priority@ -Architecture: any +Architecture: linux-any hurd-any kfreebsd-any Provides: talkd Conflicts: talkd Replaces: talkd-hurd diff --git a/debian/rules b/debian/rules index 4802e54..fe80f66 100755 --- a/debian/rules +++ b/debian/rules @@ -1,8 +1,6 @@ #!/usr/bin/make -f -DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) -DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS) +include /usr/share/dpkg/architecture.mk ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE)) conf_gnu_type += --build $(DEB_HOST_GNU_TYPE) @@ -127,8 +125,10 @@ install: build cp $(M)/telnet.1 $(D)/$(man1dir)/inetutils-telnet.1 mv $(D)/usr/bin/ftp $(D)/usr/bin/inetutils-ftp cp $(M)/ftp.1 $(D)/$(man1dir)/inetutils-ftp.1 +ifneq ($(DEB_HOST_ARCH),illumos-amd64) mv $(D)/usr/bin/talk $(D)/usr/bin/inetutils-talk cp $(M)/talk.1 $(D)/$(man1dir)/inetutils-talk.1 +endif mv $(D)/usr/bin/traceroute $(D)/usr/bin/inetutils-traceroute cp man/traceroute.1 $(D)/$(man1dir)/inetutils-traceroute.1 |