[glibc] 02/02: debian/debhelper.in/libc.[preinst, postinst}: remove code not needed since jessie.
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 1efa75416b134d71de756a75a24cab5bd887fb1a
Author: Aurelien Jarno <aurelien@aurel32.net>
Date: Sun Aug 20 16:24:53 2017 +0200
debian/debhelper.in/libc.[preinst,postinst}: remove code not needed since jessie.
---
debian/changelog | 2 ++
debian/debhelper.in/libc.postinst | 15 ---------------
debian/debhelper.in/libc.preinst | 15 ---------------
3 files changed, 2 insertions(+), 30 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index ea19b13..ba4a497 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -40,6 +40,8 @@ glibc (2.25-0experimental1) UNRELEASED; urgency=medium
Closes: #868247.
* debian/debhelper.in/libc-dev-alt.{preinst,postinst}: remove, used to
handle the multiarch transition.
+ * debian/debhelper.in/libc.[preinst,postinst}: remove code not needed
+ since jessie.
[ John David Anglin ]
* debian/patches/any/submitted-resolv-unaligned.diff: new patch to fix
diff --git a/debian/debhelper.in/libc.postinst b/debian/debhelper.in/libc.postinst
index 7378872..081b265 100644
--- a/debian/debhelper.in/libc.postinst
+++ b/debian/debhelper.in/libc.postinst
@@ -232,21 +232,6 @@ then
fi
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 7d8b560..0893108 100644
--- a/debian/debhelper.in/libc.preinst
+++ b/debian/debhelper.in/libc.preinst
@@ -382,21 +382,6 @@ then
touch /etc/ld.so.nohwcap
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#
if [ -n "$preversion" ]; then
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git
Reply to: