r6174 - in glibc-package/trunk/debian: . debhelper.in
Author: aurel32
Date: 2014-06-18 05:58:30 +0000 (Wed, 18 Jun 2014)
New Revision: 6174
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/debhelper.in/libc.postinst
glibc-package/trunk/debian/debhelper.in/libc.postrm
glibc-package/trunk/debian/debhelper.in/libc.preinst
Log:
debian/debhelper.in/libc.{preinst,postrm,postinst}: correctly remove
old ld.so configuration if more than one libc6 package is installed
(multiarch case).
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2014-06-17 18:34:28 UTC (rev 6173)
+++ glibc-package/trunk/debian/changelog 2014-06-18 05:58:30 UTC (rev 6174)
@@ -1,6 +1,9 @@
eglibc (2.19-4) UNRELEASED; urgency=medium
- *
+ [ Aurelien Jarno ]
+ * debian/debhelper.in/libc.{preinst,postrm,postinst}: correctly remove
+ old ld.so configuration if more than one libc6 package is installed
+ (multiarch case).
-- Aurelien Jarno <aurel32@debian.org> Tue, 17 Jun 2014 20:33:56 +0200
Modified: glibc-package/trunk/debian/debhelper.in/libc.postinst
===================================================================
--- glibc-package/trunk/debian/debhelper.in/libc.postinst 2014-06-17 18:34:28 UTC (rev 6173)
+++ glibc-package/trunk/debian/debhelper.in/libc.postinst 2014-06-18 05:58:30 UTC (rev 6174)
@@ -243,14 +243,14 @@
# configuration file, in order to keep a stable path. Remove the old file.
case ${DPKG_MAINTSCRIPT_ARCH:-$(dpkg --print-architecture)} in
hurd-i386)
- dpkg-maintscript-helper rm_conffile /etc/ld.so.conf.d/i486-gnu.conf 2.19-3~ libc6 -- "$@"
- dpkg-maintscript-helper rm_conffile /etc/ld.so.conf.d/i486-gnu-gnu.conf 2.19-3~ libc6 -- "$@"
+ dpkg-maintscript-helper rm_conffile /etc/ld.so.conf.d/i486-gnu.conf 2.19-4~ libc6:hurd-i386 -- "$@"
+ dpkg-maintscript-helper rm_conffile /etc/ld.so.conf.d/i486-gnu-gnu.conf 2.19-4~ libc6:hurd-i386 -- "$@"
;;
i386)
- dpkg-maintscript-helper rm_conffile /etc/ld.so.conf.d/i486-linux-gnu.conf 2.19-3~ libc6 -- "$@"
+ dpkg-maintscript-helper rm_conffile /etc/ld.so.conf.d/i486-linux-gnu.conf 2.19-4~ libc6:i386 -- "$@"
;;
kfreebsd-i386)
- dpkg-maintscript-helper rm_conffile /etc/ld.so.conf.d/i486-kfreebsd-gnu.conf 2.19-3~ libc6 -- "$@"
+ dpkg-maintscript-helper rm_conffile /etc/ld.so.conf.d/i486-kfreebsd-gnu.conf 2.19-4~ libc6:kfreebsd-i386 -- "$@"
;;
esac
Modified: glibc-package/trunk/debian/debhelper.in/libc.postrm
===================================================================
--- glibc-package/trunk/debian/debhelper.in/libc.postrm 2014-06-17 18:34:28 UTC (rev 6173)
+++ glibc-package/trunk/debian/debhelper.in/libc.postrm 2014-06-18 05:58:30 UTC (rev 6174)
@@ -41,14 +41,14 @@
# configuration file, in order to keep a stable path. Remove the old file.
case ${DPKG_MAINTSCRIPT_ARCH:-$(dpkg --print-architecture)} in
hurd-i386)
- dpkg-maintscript-helper rm_conffile /etc/ld.so.conf.d/i486-gnu.conf 2.19-3~ libc6 -- "$@"
- dpkg-maintscript-helper rm_conffile /etc/ld.so.conf.d/i486-gnu-gnu.conf 2.19-3~ libc6 -- "$@"
+ dpkg-maintscript-helper rm_conffile /etc/ld.so.conf.d/i486-gnu.conf 2.19-4~ libc6:hurd-i386 -- "$@"
+ dpkg-maintscript-helper rm_conffile /etc/ld.so.conf.d/i486-gnu-gnu.conf 2.19-4~ libc6:hurd-i386 -- "$@"
;;
i386)
- dpkg-maintscript-helper rm_conffile /etc/ld.so.conf.d/i486-linux-gnu.conf 2.19-3~ libc6 -- "$@"
+ dpkg-maintscript-helper rm_conffile /etc/ld.so.conf.d/i486-linux-gnu.conf 2.19-4~ libc6:i386 -- "$@"
;;
kfreebsd-i386)
- dpkg-maintscript-helper rm_conffile /etc/ld.so.conf.d/i486-kfreebsd-gnu.conf 2.19-3~ libc6 -- "$@"
+ dpkg-maintscript-helper rm_conffile /etc/ld.so.conf.d/i486-kfreebsd-gnu.conf 2.19-4~ libc6:kfreebsd-i386 -- "$@"
;;
esac
Modified: glibc-package/trunk/debian/debhelper.in/libc.preinst
===================================================================
--- glibc-package/trunk/debian/debhelper.in/libc.preinst 2014-06-17 18:34:28 UTC (rev 6173)
+++ glibc-package/trunk/debian/debhelper.in/libc.preinst 2014-06-18 05:58:30 UTC (rev 6174)
@@ -384,14 +384,14 @@
# configuration file, in order to keep a stable path. Remove the old file.
case ${DPKG_MAINTSCRIPT_ARCH:-$(dpkg --print-architecture)} in
hurd-i386)
- dpkg-maintscript-helper rm_conffile /etc/ld.so.conf.d/i486-gnu.conf 2.19-3~ libc6 -- "$@"
- dpkg-maintscript-helper rm_conffile /etc/ld.so.conf.d/i486-gnu-gnu.conf 2.19-3~ libc6 -- "$@"
+ dpkg-maintscript-helper rm_conffile /etc/ld.so.conf.d/i486-gnu.conf 2.19-4~ libc6:hurd-i386 -- "$@"
+ dpkg-maintscript-helper rm_conffile /etc/ld.so.conf.d/i486-gnu-gnu.conf 2.19-4~ libc6:hurd-i386 -- "$@"
;;
i386)
- dpkg-maintscript-helper rm_conffile /etc/ld.so.conf.d/i486-linux-gnu.conf 2.19-3~ libc6 -- "$@"
+ dpkg-maintscript-helper rm_conffile /etc/ld.so.conf.d/i486-linux-gnu.conf 2.19-4~ libc6:i386 -- "$@"
;;
kfreebsd-i386)
- dpkg-maintscript-helper rm_conffile /etc/ld.so.conf.d/i486-kfreebsd-gnu.conf 2.19-3~ libc6 -- "$@"
+ dpkg-maintscript-helper rm_conffile /etc/ld.so.conf.d/i486-kfreebsd-gnu.conf 2.19-4~ libc6:kfreebsd-i386 -- "$@"
;;
esac
Reply to: