r1929 - in glibc-package: branches/glibc-2.5/debian branches/glibc-2.5/debian/debhelper.in trunk/debian trunk/debian/debhelper.in
Author: aurel32
Date: 2007-02-03 20:16:19 +0100 (Sat, 03 Feb 2007)
New Revision: 1929
Modified:
glibc-package/branches/glibc-2.5/debian/changelog
glibc-package/branches/glibc-2.5/debian/debhelper.in/libc.postinst
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/debhelper.in/libc.postinst
Log:
* debhelper.in/libc.postinst: fix code adding /etc/ld.so.conf.d support to
/etc/ld.so.conf. Closes: bug#409516.
Modified: glibc-package/branches/glibc-2.5/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.5/debian/changelog 2007-02-03 12:25:17 UTC (rev 1928)
+++ glibc-package/branches/glibc-2.5/debian/changelog 2007-02-03 19:16:19 UTC (rev 1929)
@@ -263,14 +263,16 @@
* patches/kfreebsd/local-sysdeps.diff: update to revision 1886 (from
glibc-bsd).
- * patches/any/cvs-itoa-c.diff: new patch from CVS (fix sprintf %0lld with
+ * patches/any/cvs-itoa-c.diff: new patch from CVS (fix sprintf %0lld when
argument equals to 0). Closes: bug#292523.
* patches/all/local-pthread-manpages.diff: fix pthread manpages. Closes:
- bug#220719.
+ bug#220719.
* debhelper.in/libc-otherbuild.postinst: fix handling of
/etc/ld.so.hwcappkgs. Closes: bug#409374.
+ * debhelper.in/libc.postinst: fix code adding /etc/ld.so.conf.d support to
+ /etc/ld.so.conf. Closes: bug#409516.
- -- Aurelien Jarno <aurel32@debian.org> Mon, 22 Jan 2007 17:47:01 +0100
+ -- Aurelien Jarno <aurel32@debian.org> Sat, 3 Feb 2007 20:13:29 +0100
glibc (2.3.6.ds1-10) unstable; urgency=low
Modified: glibc-package/branches/glibc-2.5/debian/debhelper.in/libc.postinst
===================================================================
--- glibc-package/branches/glibc-2.5/debian/debhelper.in/libc.postinst 2007-02-03 12:25:17 UTC (rev 1928)
+++ glibc-package/branches/glibc-2.5/debian/debhelper.in/libc.postinst 2007-02-03 19:16:19 UTC (rev 1929)
@@ -132,16 +132,14 @@
fi
# Add support for /etc/ld.so.conf.d
- if dpkg --compare-versions $preversion lt 2.3.999.2-4; 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
# Handle upgrades when libc-opt package has been installed.
# We check the version between the current installed libc and libc-opt.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2007-02-03 12:25:17 UTC (rev 1928)
+++ glibc-package/trunk/debian/changelog 2007-02-03 19:16:19 UTC (rev 1929)
@@ -2,14 +2,16 @@
* patches/kfreebsd/local-sysdeps.diff: update to revision 1886 (from
glibc-bsd).
- * patches/any/cvs-itoa-c.diff: new patch from CVS (fix sprintf %0lld with
+ * patches/any/cvs-itoa-c.diff: new patch from CVS (fix sprintf %0lld when
argument equals to 0). Closes: bug#292523.
* patches/all/local-pthread-manpages.diff: fix pthread manpages. Closes:
bug#220719.
* debhelper.in/libc-otherbuild.postinst: fix handling of
/etc/ld.so.hwcappkgs. Closes: bug#409374.
+ * debhelper.in/libc.postinst: fix code adding /etc/ld.so.conf.d support to
+ /etc/ld.so.conf. Closes: bug#409516.
- -- Aurelien Jarno <aurel32@debian.org> Fri, 2 Feb 2007 22:02:59 +0100
+ -- Aurelien Jarno <aurel32@debian.org> Sat, 3 Feb 2007 20:13:29 +0100
glibc (2.3.6.ds1-10) unstable; urgency=low
Modified: glibc-package/trunk/debian/debhelper.in/libc.postinst
===================================================================
--- glibc-package/trunk/debian/debhelper.in/libc.postinst 2007-02-03 12:25:17 UTC (rev 1928)
+++ glibc-package/trunk/debian/debhelper.in/libc.postinst 2007-02-03 19:16:19 UTC (rev 1929)
@@ -146,16 +146,14 @@
fi
# Add support for /etc/ld.so.conf.d
- if dpkg --compare-versions $preversion lt 2.3.6-16; 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
# Handle upgrades when libc-opt package has been installed.
# We check the version between the current installed libc and libc-opt.
Reply to: