diff -u glibc-2.4/debian/changelog glibc-2.4/debian/changelog --- glibc-2.4/debian/changelog +++ glibc-2.4/debian/changelog @@ -1,3 +1,12 @@ +glibc (2.4-1ubuntu12.3) edgy-updates; urgency=low + + * Turn libc6 duplication check from an error to a warning and + point to the bug when printing the warning. + * Stop warning if hitting libpthread.so.20. + (Closes Ubuntu: #81125): + + -- Fabio M. Di Nitto Wed, 24 Jan 2007 14:03:36 +0100 + glibc (2.4-1ubuntu12.2) edgy-updates; urgency=low * Propagate to edgy-updates from edgy-proposed. diff -u glibc-2.4/debian/debhelper.in/libc.preinst glibc-2.4/debian/debhelper.in/libc.preinst --- glibc-2.4/debian/debhelper.in/libc.preinst +++ glibc-2.4/debian/debhelper.in/libc.preinst @@ -128,7 +128,8 @@ fi if test -d $dir; then output=$(ls $dir | egrep '^lib(c|m|pthread|rt|dl)\.so\.[^/]*$' |\ - egrep -v '^lib[cm]\.so\.[45].*$' 2>/dev/null) + egrep -v '^lib[cm]\.so\.[45].*$' |\ + egrep -v '^libpthread\.so\.20' 2>/dev/null) if test -n "$output"; then # See if the found libraries are compatible with the system ld.so; @@ -169,7 +170,8 @@ echo "A copy of glibc was found in an unexpected directory." echo "It is not safe to upgrade the C library in this situation;" echo "please remove that copy of the C library and try again." - exit 1 + echo "Please check: https://launchpad.net/bugs/81125" +# exit 1 fi if test -n "$LD_LIBRARY_PATH"; then @@ -179,7 +181,8 @@ echo "Another copy of the C library was found via LD_LIBRARY_PATH." echo "It is not safe to upgrade the C library in this situation;" echo "please remove the directory from LD_LIBRARY_PATH and try again." - exit 1 + echo "Please check: https://launchpad.net/bugs/81125" +# exit 1 fi fi if test -e /etc/ld.so.conf; then @@ -189,7 +192,8 @@ echo "Another copy of the C library was found via /etc/ld.so.conf." echo "It is not safe to upgrade the C library in this situation;" echo "please remove the directory from /etc/ld.so.conf and try again." - exit 1 + echo "Please check: https://launchpad.net/bugs/81125" +# exit 1 fi fi fi