r2154 - in glibc-package/trunk/debian: . debhelper.in
Author: aurel32
Date: 2007-04-30 14:28:15 +0000 (Mon, 30 Apr 2007)
New Revision: 2154
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/debhelper.in/libc.postinst
Log:
* debhelper.in/libc.postint: remove the version check when creating
ld.so.conf. Closes: #420726.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2007-04-30 14:22:10 UTC (rev 2153)
+++ glibc-package/trunk/debian/changelog 2007-04-30 14:28:15 UTC (rev 2154)
@@ -33,10 +33,12 @@
hash-style=gnu.
* debian/control.in/main: build depends on gcc-4.1-multilib on bi-arch
architectures.
- * control.in/amd64, control.in/i386, control.in/kfreebsd-i386,
- control.in/mipsn32, control.in/mips64, control.in/powerpc,
+ * control.in/amd64, control.in/i386, control.in/kfreebsd-i386,
+ control.in/mipsn32, control.in/mips64, control.in/powerpc,
control.in/ppc64, control.in/s390x, control.in/sparc64: drop the
- depends on lib32gcc1/lib64gcc1. Recommends gcc-multilib
+ depends on lib32gcc1/lib64gcc1. Recommends gcc-multilib.
+ * debhelper.in/libc.postint: remove the version check when creating
+ ld.so.conf. Closes: #420726.
[ Michael Banck ]
* patches/hurd-i386/local-dl-dynamic-weak.diff: new patch (turn
@@ -63,7 +65,7 @@
[ Clint Adams ]
* Switch from linux-kernel-headers to linux-libc-dev | linux-kernel-headers.
- -- Aurelien Jarno <aurel32@debian.org> Mon, 30 Apr 2007 16:20:02 +0200
+ -- Aurelien Jarno <aurel32@debian.org> Mon, 30 Apr 2007 16:24:07 +0200
glibc (2.5-4) unstable; urgency=low
Modified: glibc-package/trunk/debian/debhelper.in/libc.postinst
===================================================================
--- glibc-package/trunk/debian/debhelper.in/libc.postinst 2007-04-30 14:22:10 UTC (rev 2153)
+++ glibc-package/trunk/debian/debhelper.in/libc.postinst 2007-04-30 14:28:15 UTC (rev 2154)
@@ -132,16 +132,14 @@
fi
# Add support for /etc/ld.so.conf.d
- if [ -z "$preversion" ] || dpkg --compare-versions $preversion lt 2.3.6.ds1-11; then
- if [ -e /etc/ld.so.conf ]; then
- [ -z "$(tail -n 1 /etc/ld.so.conf)" ] || echo >> /etc/ld.so.conf
- else
- touch /etc/ld.so.conf
- fi
- if ! grep -q '^include /etc/ld.so.conf.d/.*\.conf$' /etc/ld.so.conf ; then
- echo 'include /etc/ld.so.conf.d/*.conf' >> /etc/ld.so.conf
- fi
+ if [ -e /etc/ld.so.conf ]; then
+ [ -z "$(tail -n 1 /etc/ld.so.conf)" ] || echo >> /etc/ld.so.conf
+ else
+ touch /etc/ld.so.conf
fi
+ if ! grep -q '^include /etc/ld.so.conf.d/.*\.conf$' /etc/ld.so.conf ; then
+ echo 'include /etc/ld.so.conf.d/*.conf' >> /etc/ld.so.conf
+ fi
# We don't use a registry anymore, remove the old file
rm -f /etc/ld.so.hwcappkgs
Reply to: