r2021 - in glibc-package/trunk/debian: . control.in rules.d
Author: madcoder
Date: 2007-03-05 09:45:00 +0000 (Mon, 05 Mar 2007)
New Revision: 2021
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/control
glibc-package/trunk/debian/control.in/main
glibc-package/trunk/debian/rules.d/debhelper.mk
Log:
Fixes the nscd dependencies problem once for all.
* control.in/main, rules.d/debhelper.mk: Backport fix from Aur?\195?\169lien in the
glibc-2.5 branch: use dh_shlibdeps to set the dependencies of nscd.
Closes: #409288, #412562.
Signed-off-by: Pierre Habouzit <madcoder@debian.org>
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2007-03-05 09:34:52 UTC (rev 2020)
+++ glibc-package/trunk/debian/changelog 2007-03-05 09:45:00 UTC (rev 2021)
@@ -3,6 +3,9 @@
[ Pierre Habouzit ]
* any/cvs-sunrpc-64bits-svc_getreqset.diff: fix 64bits issue for 64bits
machines (affects mount, causes CPU hog if triggered). Closes: #413450.
+ * control.in/main, rules.d/debhelper.mk: Backport fix from Aurélien in the
+ glibc-2.5 branch: use dh_shlibdeps to set the dependencies of nscd.
+ Closes: #409288, #412562.
-- Pierre Habouzit <madcoder@debian.org> Mon, 5 Mar 2007 10:32:34 +0100
Modified: glibc-package/trunk/debian/control
===================================================================
--- glibc-package/trunk/debian/control 2007-03-05 09:34:52 UTC (rev 2020)
+++ glibc-package/trunk/debian/control 2007-03-05 09:45:00 UTC (rev 2021)
@@ -58,7 +58,7 @@
Architecture: alpha amd64 arm arm-softfloat armeb i386 m32r m68k mips mipsel powerpc ppc64 sparc ia64 hppa s390 sh3 sh4 sh3eb sh4eb kfreebsd-i386 kfreebsd-amd64
Section: admin
Priority: optional
-Depends: libc6 (>= ${Source-Version})
+Depends: ${shlibs:Depends}
Description: GNU C Library: Name Service Cache Daemon
A daemon which handles passwd, group and host lookups
for running programs and caches the results for the next
Modified: glibc-package/trunk/debian/control.in/main
===================================================================
--- glibc-package/trunk/debian/control.in/main 2007-03-05 09:34:52 UTC (rev 2020)
+++ glibc-package/trunk/debian/control.in/main 2007-03-05 09:45:00 UTC (rev 2021)
@@ -58,7 +58,7 @@
Architecture: @threads_archs@
Section: admin
Priority: optional
-Depends: @libc@ (>= ${Source-Version})
+Depends: ${shlibs:Depends}
Description: GNU C Library: Name Service Cache Daemon
A daemon which handles passwd, group and host lookups
for running programs and caches the results for the next
Modified: glibc-package/trunk/debian/rules.d/debhelper.mk
===================================================================
--- glibc-package/trunk/debian/rules.d/debhelper.mk 2007-03-05 09:34:52 UTC (rev 2020)
+++ glibc-package/trunk/debian/rules.d/debhelper.mk 2007-03-05 09:45:00 UTC (rev 2021)
@@ -125,7 +125,9 @@
dh_makeshlibs -p$(curpass) -V "$(call xx,shlib_dep)"
dh_installdeb -p$(curpass)
- # dh_shlibdeps -p$(curpass)
+ if [ $(curpass) = nscd ] ; then \
+ dh_shlibdeps -p$(curpass) ; \
+ fi
dh_gencontrol -p$(curpass) -- $($(curpass)_control_flags)
dh_md5sums -p$(curpass)
dh_builddeb -p$(curpass)
Reply to: