Package: procps
Version: 1:3.2.8-11
Severity: important
Tags: patch

When building procps in a clean chroot, the /usr/lib/libproc.so symlink
in libproc-dev ends up pointing to (literally) /lib/libproc*.so, instead
of an existing file.

I'm attaching a patch to fix this for unstable.

Chris
>From d7da1c5923e6a36ecb598eaded9880cd64a18b3b Mon Sep 17 00:00:00 2001
From: Christian Hofstaedtler <[email protected]>
Date: Tue, 23 Aug 2011 00:22:13 +0200
Subject: [PATCH] Fix installation of /usr/lib/libproc.so symlink

Previously the symlink would only be installed in a correct way
when procps was already installed on the build system, possibly
also requiring the correct version.
---
 debian/libproc-dev.install |    1 -
 debian/rules               |    4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/debian/libproc-dev.install b/debian/libproc-dev.install
index 43c8280..a8ca5a7 100644
--- a/debian/libproc-dev.install
+++ b/debian/libproc-dev.install
@@ -1,3 +1,2 @@
 proc/*.h  usr/include/proc
 static/libproc.a usr/lib
-static/libproc.so usr/lib
diff --git a/debian/rules b/debian/rules
index 760ad71..8b0edc6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,7 +15,6 @@ else
 CROSS=
 endif
 
-PROCLIB = $(shell basename proc/libproc-*.so)
 CFLAGS=-g
 
 %:
@@ -33,13 +32,14 @@ override_dh_auto_build:
        mv proc/libproc.a static
        $(MAKE) clean
        $(MAKE) $(CROSS) W_SHOWFROM=\-DW_SHOWFROM lib64=lib m64= 
CFLAGS="$(CFLAGS)"
-       ( cd static && ln -s /lib/$(PROCLIB) libproc.so )
 
        touch build-stamp
 
 override_dh_auto_install:
        $(MAKE) $(CROSS) lib64=lib ln_f="ln -sf" ldconfig=echo 
DESTDIR=$(DEBROOT) install
 
+       dh_link -plibproc-dev /lib/$(shell basename proc/libproc*.so) 
/usr/lib/libproc.so
+
        # Rename w as there are two of them
        (cd $(DEBROOT)/usr/bin && mv w w.procps )
        (cd $(DEBROOT)/usr/share/man/man1 && mv w.1 w.procps.1 )
-- 
1.7.5.4

Reply via email to