[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

r2103 - in glibc-package/trunk/debian: . debhelper.in



Author: aurel32
Date: 2007-04-20 17:02:08 +0000 (Fri, 20 Apr 2007)
New Revision: 2103

Modified:
   glibc-package/trunk/debian/changelog
   glibc-package/trunk/debian/debhelper.in/libc.preinst
Log:
  * debhelper.in/libc.preinst: check the library files instead of links
    while checking for a non-dpkg owned libc6 in /lib/tls. Links are 
    recreated by ldconfig.



Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog	2007-04-20 16:58:53 UTC (rev 2102)
+++ glibc-package/trunk/debian/changelog	2007-04-20 17:02:08 UTC (rev 2103)
@@ -12,8 +12,11 @@
     -4 special case handling when wcp == wstartp + 1).  Closes: #419225.
   * patches/any/cvs-bits_in_h-ipv6.diff: new patch from CVS (defines
     IPV6_V6ONLY in bits/in.h).  Closes: #420188.
+  * debhelper.in/libc.preinst: check the library files instead of links
+    while checking for a non-dpkg owned libc6 in /lib/tls. Links are 
+    recreated by ldconfig.
 
- -- Aurelien Jarno <aurel32@debian.org>  Fri, 20 Apr 2007 18:57:55 +0200
+ -- Aurelien Jarno <aurel32@debian.org>  Fri, 20 Apr 2007 19:01:16 +0200
 
 glibc (2.5-3) unstable; urgency=low
 

Modified: glibc-package/trunk/debian/debhelper.in/libc.preinst
===================================================================
--- glibc-package/trunk/debian/debhelper.in/libc.preinst	2007-04-20 16:58:53 UTC (rev 2102)
+++ glibc-package/trunk/debian/debhelper.in/libc.preinst	2007-04-20 17:02:08 UTC (rev 2103)
@@ -184,7 +184,7 @@
       exit 1
     fi
   fi
-  for i in libc.so.0.1 libc.so.6 libc.so.6.1 libdl.so.2 ; do
+  for i in ld-2.3.2.so libc-2.3.2.so ld-2.3.6.so libc-2.3.6.so ; do
     if [ -e /lib/tls/$i ] && ! dpkg-query -L LIBC 2>/dev/null | grep -q /lib/tls/$i ; then
       echo
       echo "A non-dpkg owned copy of the C library was found in /lib/tls."



Reply to: