Control: tags -1 + patch
On 2016-07-14 21:25 +0200, Sven Joachim wrote:
> Package: procps
> Version: 2:3.3.12-2
>
> After the fix for bug #816237, the procps.install files for kfreebsd and
> hurd install kill(1) as /bin/kill.procps/kill. I suppose that is not
> what has been intended, but sadly it is not possible to rename files
> with dh_install (unless you make them executable and run them via
> dh_exec, that is).
Attached is a patch which should fix that. I am fairly confident that
it works, but as I don't have a kfreebsd system it is not tested.
Cheers,
Sven
>From eca4ea81fd9c81142fb575df6a40ca44e05969af Mon Sep 17 00:00:00 2001
From: Sven Joachim <[email protected]>
Date: Fri, 15 Jul 2016 07:38:17 +0200
Subject: [PATCH] Fix path for kill on kfreebsd systems
Use the same code as for hurd in debian/rules and rename kill to
kill.procps there rather than trying to do it in the install file
which does not work as intended. This has the additional advantage
that there will be a manpage for kill.procs.
---
debian/procps.install.kfreebsd | 2 +-
debian/rules | 13 ++++---------
2 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/debian/procps.install.kfreebsd b/debian/procps.install.kfreebsd
index 186d81b..0dcae1a 100644
--- a/debian/procps.install.kfreebsd
+++ b/debian/procps.install.kfreebsd
@@ -1,4 +1,4 @@
# Files to install for kfreebsd systems
-bbin/kill bin/kill.procps
+bbin/kill.procps bin
bbin/ps bin
bin/* /usr/bin
diff --git a/debian/rules b/debian/rules
index 111491e..0414541 100755
--- a/debian/rules
+++ b/debian/rules
@@ -59,21 +59,16 @@ ifneq ($(DEB_HOST_ARCH_OS), linux)
$(DEBROOT)/usr/share/man/man8/sysctl.8 \
$(DEBROOT)/usr/share/man/man5/sysctl.conf.5 \
$(NULL)
-endif
-ifeq ($(DEB_HOST_ARCH_OS), kfreebsd)
- rm -f \
- $(DEBROOT)/bin/kill \
- $(DEBROOT)/usr/share/man/man1/kill.1 \
- $(NULL)
+
+ # Rename kill as there are two of them
+ (cd $(DEBROOT)/bin && mv kill kill.procps )
+ (cd $(DEBROOT)/usr/share/man/man1 && mv kill.1 kill.procps.1 )
endif
ifeq ($(DEB_HOST_ARCH_OS), hurd)
rm -f \
$(DEBROOT)/bin/pmap \
$(DEBROOT)/usr/share/man/man1/pmap.1 \
$(NULL)
- # Rename kill as there are two of them
- (cd $(DEBROOT)/bin && mv kill kill.procps )
- (cd $(DEBROOT)/usr/share/man/man1 && mv kill.1 kill.procps.1 )
# Rename vmstat as there are two of them
(cd $(DEBROOT)/bin && mv vmstat vmstat.procps )
--
2.8.1
