[glibc] 05/09: debian/debhelper.in/libc.preinst, debian/debhelper.in/libc.postrm: drop code to handle upgrades from wheezy.
This is an automated email from the git hooks/post-receive script.
aurel32 pushed a commit to branch glibc-2.25
in repository glibc.
commit af28c61e2bd837246daf848fd5dd824d21d4ad35
Author: Aurelien Jarno <aurelien@aurel32.net>
Date: Sat Aug 26 15:44:32 2017 +0200
debian/debhelper.in/libc.preinst, debian/debhelper.in/libc.postrm: drop code to handle upgrades from wheezy.
---
debian/changelog | 2 ++
debian/debhelper.in/libc.postrm | 19 -------------------
debian/debhelper.in/libc.preinst | 20 --------------------
3 files changed, 2 insertions(+), 39 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 145dd25..17f7b7f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,8 @@ glibc (2.25-0experimental2) UNRELEASED; urgency=medium
* debian/debhelper.in/libc.postinst, debian/debhelper.in/libc.templates,
debian/po/*: do not call /etc/init.d scripts even as a fallback as
invoke-rc.d is now always available.
+ * debian/debhelper.in/libc.preinst, debian/debhelper.in/libc.postrm: drop
+ code to handle upgrades from wheezy.
-- Aurelien Jarno <aurel32@debian.org> Sun, 20 Aug 2017 19:05:48 +0200
diff --git a/debian/debhelper.in/libc.postrm b/debian/debhelper.in/libc.postrm
index 6e60898..e11b180 100644
--- a/debian/debhelper.in/libc.postrm
+++ b/debian/debhelper.in/libc.postrm
@@ -33,25 +33,6 @@ if [ "$1" = deconfigure ]; then
:; # blah, do something useful with ldso
fi
-#if [ "$1" = purge ]; then
-# update-rc.d mountkernfs remove > /dev/null
-#fi
-
-# We now use the multiarch triplet instead of the GNU triplet for the ld.so
-# 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-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-11~ libc0.1:kfreebsd-i386 -- "$@"
- ;;
-esac
-
#DEBHELPER#
exit 0
diff --git a/debian/debhelper.in/libc.preinst b/debian/debhelper.in/libc.preinst
index 0893108..10c179b 100644
--- a/debian/debhelper.in/libc.preinst
+++ b/debian/debhelper.in/libc.preinst
@@ -273,26 +273,6 @@ then
fi
fi
- # ldconfig might have broken the ld.so symlink in case a biarch package
- # of the same architecture than the native one has been installed (e.g.:
- # libc6-amd64:i386 on amd64). Try to detect this by checking that the
- # ld.so symlink correctly points to ld-*.so in the slib directory, and
- # disabling ldconfig if it is not the case and the new version hasn't
- # been unpacked yet. The symlink will be fixed when unpacking the new
- # libc version and ldconfig will be re-enabled when a new fixed version
- # is unpacked.
- if ! readlink -m RTLD_SO | grep -qE 'SLIBDIR/ld-[0-9.]+\.so' ; then
- # The unpack order is not guaranteed, only disable ldconfig if
- # a "broken" version is installed.
- libc_bin_version=$(dpkg-query -W -f='${Version}' libc-bin)
- if dpkg --compare-versions "$libc_bin_version" lt "2.18-2"; then
- echo "Warning: found a potentially broken dynamic loader symlink,"
- echo "disabling ldconfig to avoid a possible system breakage. It"
- echo "will be reenabled when a new version of libc-bin is unpacked."
- ln -sf /bin/true /sbin/ldconfig
- fi
- fi
-
if [ -n "$preversion" ] && [ -x "$(which ischroot)" ] && ! ischroot; then
# NSS authentication trouble guard
if dpkg --compare-versions "$preversion" lt GLIBC_VERSION; then
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git
Reply to: