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

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



Author: aurel32
Date: 2014-03-01 13:27:05 +0000 (Sat, 01 Mar 2014)
New Revision: 5977

Modified:
   glibc-package/trunk/debian/changelog
   glibc-package/trunk/debian/debhelper.in/libc-alt.postrm
Log:
debian/debhelper.in/libc-alt.postrm: generalize the dynamic linker
symlink removal to all biarch packages.

Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog	2014-02-27 21:56:17 UTC (rev 5976)
+++ glibc-package/trunk/debian/changelog	2014-03-01 13:27:05 UTC (rev 5977)
@@ -8,6 +8,8 @@
   * debian/debhelper.in/libc.preinst: only disable ldconfig after making
     sure a fixed version hasn't already been unpacked, as the unpack order
     is not guaranteed.
+  * debian/debhelper.in/libc-alt.postrm: generalize the dynamic linker
+    symlink removal to all biarch packages.
 
  -- Adam Conrad <adconrad@0c3.net>  Sun, 23 Feb 2014 21:29:11 -0700
 

Modified: glibc-package/trunk/debian/debhelper.in/libc-alt.postrm
===================================================================
--- glibc-package/trunk/debian/debhelper.in/libc-alt.postrm	2014-02-27 21:56:17 UTC (rev 5976)
+++ glibc-package/trunk/debian/debhelper.in/libc-alt.postrm	2014-03-01 13:27:05 UTC (rev 5977)
@@ -2,11 +2,13 @@
 set -e
 
 if [ "$1" = remove ]; then
-    ARCH=${DPKG_MAINTSCRIPT_ARCH:-$(dpkg --print-architecture)}
-    if [ "${ARCH}" = "amd64" ] && [ "LIBC-FLAVOR" = "libc6-i386" ]; then
-	if [ -h /lib/ld-linux.so.2 ] && [ ! -f /lib/ld-linux.so.2 ]; then
-	    rm /lib/ld-linux.so.2
-	fi
+    # Native multiarch packages declare a Replaces: on the corresponding
+    # biarch package. Therefore if both a biarch package and the corresponding
+    # multiarch package are installed, then the multiarch package is removed,
+    # and then the biarch package is removed, the dynamic linker symlink
+    # becomes a dangling symlink. Remove it in that case.
+    if [ -h RTLD_SO ] && [ ! -f RTLD_SO ]; then
+        rm RTLD_SO
     fi
 fi
 


Reply to: