r1942 - in glibc-package/branches/glibc-2.5/debian: . control.in rules.d
Author: aurel32
Date: 2007-02-05 21:37:43 +0100 (Mon, 05 Feb 2007)
New Revision: 1942
Modified:
glibc-package/branches/glibc-2.5/debian/changelog
glibc-package/branches/glibc-2.5/debian/control
glibc-package/branches/glibc-2.5/debian/control.in/main
glibc-package/branches/glibc-2.5/debian/rules.d/debhelper.mk
Log:
* control.in/main, rules.d/debhelper.mk: use dh_shlibdeps to set the
dependencies of nscd. Closes: #409288.
Modified: glibc-package/branches/glibc-2.5/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.5/debian/changelog 2007-02-05 19:08:00 UTC (rev 1941)
+++ glibc-package/branches/glibc-2.5/debian/changelog 2007-02-05 20:37:43 UTC (rev 1942)
@@ -90,6 +90,8 @@
* patches/any/cvs-lt-update.diff: new patch (linuxthreads update) from
upstream CVS.
* debhelper.in/locales.templates: recommends UTF-8 locales by default.
+ * control.in/main, rules.d/debhelper.mk: use dh_shlibdeps to set the
+ dependencies of nscd. Closes: #409288.
[ Denis Barbier ]
* Remove localedata/locale-en_NZ.diff (merged upstream).
Modified: glibc-package/branches/glibc-2.5/debian/control
===================================================================
--- glibc-package/branches/glibc-2.5/debian/control 2007-02-05 19:08:00 UTC (rev 1941)
+++ glibc-package/branches/glibc-2.5/debian/control 2007-02-05 20:37:43 UTC (rev 1942)
@@ -59,7 +59,7 @@
Architecture: alpha amd64 arm arm-softfloat armeb armel 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/branches/glibc-2.5/debian/control.in/main
===================================================================
--- glibc-package/branches/glibc-2.5/debian/control.in/main 2007-02-05 19:08:00 UTC (rev 1941)
+++ glibc-package/branches/glibc-2.5/debian/control.in/main 2007-02-05 20:37:43 UTC (rev 1942)
@@ -59,7 +59,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/branches/glibc-2.5/debian/rules.d/debhelper.mk
===================================================================
--- glibc-package/branches/glibc-2.5/debian/rules.d/debhelper.mk 2007-02-05 19:08:00 UTC (rev 1941)
+++ glibc-package/branches/glibc-2.5/debian/rules.d/debhelper.mk 2007-02-05 20:37:43 UTC (rev 1942)
@@ -131,7 +131,9 @@
fi
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: