r4734 - in glibc-package/trunk/debian: . debhelper.in
Author: aurel32
Date: 2011-06-12 11:02:05 +0000 (Sun, 12 Jun 2011)
New Revision: 4734
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/debhelper.in/libc.preinst
Log:
* debhelper.in/libc.preinst: automatically remove leftovers from libc5 to
libc6 transition (upgrade from Bo to Hamm). Closes: #629534.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2011-06-12 10:44:52 UTC (rev 4733)
+++ glibc-package/trunk/debian/changelog 2011-06-12 11:02:05 UTC (rev 4734)
@@ -13,6 +13,8 @@
Closes: #625607.
* debhelper.in/libc.preinst: improve error message when an old copy of ld.so
is found. Closes: #629983.
+ * debhelper.in/libc.preinst: automatically remove leftovers from libc5 to
+ libc6 transition (upgrade from Bo to Hamm). Closes: #629534.
-- Aurelien Jarno <aurel32@debian.org> Sat, 11 Jun 2011 18:11:51 +0200
Modified: glibc-package/trunk/debian/debhelper.in/libc.preinst
===================================================================
--- glibc-package/trunk/debian/debhelper.in/libc.preinst 2011-06-12 10:44:52 UTC (rev 4733)
+++ glibc-package/trunk/debian/debhelper.in/libc.preinst 2011-06-12 11:02:05 UTC (rev 4734)
@@ -237,13 +237,21 @@
continue
fi
# Skip if it is a symlink (as installed by lsb-core)
- if test -L $i ; then
+ if test -L "$i" ; then
continue
fi
# Binaries owned packages are considered to do the right thing
- if dpkg-query -L LIBC 2>/dev/null | grep -q $i; then
+ if dpkg-query -L LIBC 2>/dev/null | grep -q "$i"; then
continue
fi
+ # Remove leftovers from libc5 to libc6 transition
+ case "$i" in
+ /lib/ld.so | /lib/ld.so.1.*.*)
+ echo "Warning: removing leftover from libc5 to libc6 transition: '$i'"
+ rm -f "$i"
+ continue
+ ;;
+ esac
# Stop the upgrade if there is a risk of crash after the upgrade
echo
echo "A non-dpkg owned copy of the C library was found:"
Reply to: