r6262 - in glibc-package/trunk/debian: . debhelper.in
Author: aurel32
Date: 2014-08-28 17:31:34 +0000 (Thu, 28 Aug 2014)
New Revision: 6262
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,postinst,postrm}: correctly remove old
conffiles /etc/ld.so.conf.d/i486-{kfreebsd-gnu.conf,gnu-gnu.conf,gnu.conf}.
Closes: #759568.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2014-08-28 06:28:41 UTC (rev 6261)
+++ glibc-package/trunk/debian/changelog 2014-08-28 17:31:34 UTC (rev 6262)
@@ -11,6 +11,9 @@
[ Aurelien Jarno ]
* debian/control.in/main: Build-Depends on dpkg (>= 1.17.11) instead of
dpkg-dev (>= 1.17.1). Closes: #759495.
+ * debian/debhelper.in/libc.{preinst,postinst,postrm}: correctly remove old
+ conffiles /etc/ld.so.conf.d/i486-{kfreebsd-gnu.conf,gnu-gnu.conf,gnu.conf}.
+ Closes: #759568.
-- Aurelien Jarno <aurel32@debian.org> Wed, 27 Aug 2014 08:22:41 +0200
Modified: glibc-package/trunk/debian/debhelper.in/libc.postinst
===================================================================
--- glibc-package/trunk/debian/debhelper.in/libc.postinst 2014-08-28 06:28:41 UTC (rev 6261)
+++ glibc-package/trunk/debian/debhelper.in/libc.postinst 2014-08-28 17:31:34 UTC (rev 6262)
@@ -246,14 +246,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-4~ libc6:hurd-i386 -- "$@"
- dpkg-maintscript-helper rm_conffile /etc/ld.so.conf.d/i486-gnu-gnu.conf 2.19-4~ libc6:hurd-i386 -- "$@"
+ dpkg-maintscript-helper rm_conffile /etc/ld.so.conf.d/i486-gnu.conf 2.19-11~ libc0.3:hurd-i386 -- "$@"
+ dpkg-maintscript-helper rm_conffile /etc/ld.so.conf.d/i486-gnu-gnu.conf 2.19-11~ libc0.3:hurd-i386 -- "$@"
;;
i386)
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-4~ libc6:kfreebsd-i386 -- "$@"
+ dpkg-maintscript-helper rm_conffile /etc/ld.so.conf.d/i486-kfreebsd-gnu.conf 2.19-11~ libc0.1:kfreebsd-i386 -- "$@"
;;
esac
Modified: glibc-package/trunk/debian/debhelper.in/libc.postrm
===================================================================
--- glibc-package/trunk/debian/debhelper.in/libc.postrm 2014-08-28 06:28:41 UTC (rev 6261)
+++ glibc-package/trunk/debian/debhelper.in/libc.postrm 2014-08-28 17:31:34 UTC (rev 6262)
@@ -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-4~ libc6:hurd-i386 -- "$@"
- dpkg-maintscript-helper rm_conffile /etc/ld.so.conf.d/i486-gnu-gnu.conf 2.19-4~ libc6:hurd-i386 -- "$@"
+ dpkg-maintscript-helper rm_conffile /etc/ld.so.conf.d/i486-gnu.conf 2.19-11~ libc0.3:hurd-i386 -- "$@"
+ dpkg-maintscript-helper rm_conffile /etc/ld.so.conf.d/i486-gnu-gnu.conf 2.19-11~ libc0.3:hurd-i386 -- "$@"
;;
i386)
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-4~ libc6:kfreebsd-i386 -- "$@"
+ dpkg-maintscript-helper rm_conffile /etc/ld.so.conf.d/i486-kfreebsd-gnu.conf 2.19-11~ libc0.1:kfreebsd-i386 -- "$@"
;;
esac
Modified: glibc-package/trunk/debian/debhelper.in/libc.preinst
===================================================================
--- glibc-package/trunk/debian/debhelper.in/libc.preinst 2014-08-28 06:28:41 UTC (rev 6261)
+++ glibc-package/trunk/debian/debhelper.in/libc.preinst 2014-08-28 17:31:34 UTC (rev 6262)
@@ -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-4~ libc6:hurd-i386 -- "$@"
- dpkg-maintscript-helper rm_conffile /etc/ld.so.conf.d/i486-gnu-gnu.conf 2.19-4~ libc6:hurd-i386 -- "$@"
+ dpkg-maintscript-helper rm_conffile /etc/ld.so.conf.d/i486-gnu.conf 2.19-11~ libc0.3:hurd-i386 -- "$@"
+ dpkg-maintscript-helper rm_conffile /etc/ld.so.conf.d/i486-gnu-gnu.conf 2.19-11~ libc0.3:hurd-i386 -- "$@"
;;
i386)
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-4~ libc6:kfreebsd-i386 -- "$@"
+ dpkg-maintscript-helper rm_conffile /etc/ld.so.conf.d/i486-kfreebsd-gnu.conf 2.19-11~ libc0.1:kfreebsd-i386 -- "$@"
;;
esac
Reply to: