r1579 - glibc-package/branches/glibc-2.4/debian/debhelper.in

[Denis Barbier <barbier@costa.debian.org>]

Author: barbier
Date: 2006-05-29 23:24:01 +0000 (Mon, 29 May 2006)
New Revision: 1579

Modified:
   glibc-package/branches/glibc-2.4/debian/debhelper.in/libc.postinst
Log:
Modify /etc/ld.so.conf only when upgrading from glibc < 2.3.999.2-3


Modified: glibc-package/branches/glibc-2.4/debian/debhelper.in/libc.postinst
===================================================================
--- glibc-package/branches/glibc-2.4/debian/debhelper.in/libc.postinst	2006-05-29 23:19:01 UTC (rev 1578)
+++ glibc-package/branches/glibc-2.4/debian/debhelper.in/libc.postinst	2006-05-29 23:24:01 UTC (rev 1579)
@@ -146,14 +146,16 @@
     fi
 
     # Add support for /etc/ld.so.conf.d
-    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
+    if dpkg --compare-versions $preversion lt 2.3.999.2-3; 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
     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.