[glibc] 01/02: Remove ldconfig wrapper, new debhelper versions use the trigger directly
This is an automated email from the git hooks/post-receive script.
aurel32 pushed a commit to branch glibc-2.22
in repository glibc.
commit cafff52ac961fd04d4243b42b27526a6b77cd3ec
Author: Aurelien Jarno <aurelien@aurel32.net>
Date: Fri Jan 22 22:31:51 2016 +0100
Remove ldconfig wrapper, new debhelper versions use the trigger directly
---
debian/changelog | 4 ++++
debian/debhelper.in/libc-bin.lintian-overrides | 5 +----
debian/debhelper.in/libc-bin.postinst | 2 --
debian/local/sbin/ldconfig | 16 ----------------
debian/rules.d/debhelper.mk | 7 -------
5 files changed, 5 insertions(+), 29 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 4fa5628..cdec51f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -59,6 +59,10 @@ glibc (2.22-0experimental2) UNRELEASED; urgency=medium
XC-Package-Type into Package-Type.
* debian/control.in/libc: drop conflicts on prelink (<= 0.0.20090311-1) as
we don't support Lenny to Stretch upgrades.
+ * debian/debhelper.in/libc-bin.{postinst,lintian-overrides},
+ debian/rules.d/debhelper.mk, debian/local/sbin/ldconfig: remove ldconfig
+ wrapper as new debhelper versions use the trigger instead of an explicit
+ call to ldconfig.
-- Aurelien Jarno <aurel32@debian.org> Thu, 10 Dec 2015 23:41:13 +0100
diff --git a/debian/debhelper.in/libc-bin.lintian-overrides b/debian/debhelper.in/libc-bin.lintian-overrides
index f2ba6f5..3c52c43 100644
--- a/debian/debhelper.in/libc-bin.lintian-overrides
+++ b/debian/debhelper.in/libc-bin.lintian-overrides
@@ -1,15 +1,12 @@
# ldconfig must be executable even when the libc is not configured, and
# thus must be linked statically
-libc-bin: statically-linked-binary sbin/ldconfig.real
+libc-bin: statically-linked-binary sbin/ldconfig
# pt_chown must be setuid root and in /usr/lib, otherwise non-root users
# won't be able to login
libc-bin: setuid-binary usr/lib/pt_chown 4755 root/root
libc-bin: sharedobject-in-library-directory-missing-soname usr/lib/pt_chown
-# ldconfig.real doesn't have a manpage, since it's just ldconfig renamed
-libc-bin: binary-without-manpage sbin/ldconfig.real
-
# these manpages have been moved to the manpages package
libc-bin: binary-without-manpage sbin/ldconfig
libc-bin: binary-without-manpage usr/bin/getent
diff --git a/debian/debhelper.in/libc-bin.postinst b/debian/debhelper.in/libc-bin.postinst
index 9d804b4..8b10d45 100644
--- a/debian/debhelper.in/libc-bin.postinst
+++ b/debian/debhelper.in/libc-bin.postinst
@@ -13,8 +13,6 @@ if [ "$1" = "configure" ] && [ "$2" = "" ] ; then
fi
if [ "$1" = "triggered" ]; then
- LDCONFIG_NOTRIGGER=y
- export LDCONFIG_NOTRIGGER
ldconfig || ldconfig --verbose
exit 0
fi
diff --git a/debian/local/sbin/ldconfig b/debian/local/sbin/ldconfig
deleted file mode 100644
index 6ccdf0c..0000000
--- a/debian/local/sbin/ldconfig
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-if test $# = 0 \
- && test x"$LDCONFIG_NOTRIGGER" = x \
- && test x"$DPKG_MAINTSCRIPT_PACKAGE" != x \
- && dpkg-trigger --check-supported 2>/dev/null
-then
- if dpkg-trigger --no-await ldconfig; then
- if test x"$LDCONFIG_TRIGGER_DEBUG" != x; then
- echo "ldconfig: wrapper deferring update (trigger activated)"
- fi
- exit 0
- fi
-fi
-
-exec /sbin/ldconfig.real "$@"
diff --git a/debian/rules.d/debhelper.mk b/debian/rules.d/debhelper.mk
index ac16814..6f33ed8 100644
--- a/debian/rules.d/debhelper.mk
+++ b/debian/rules.d/debhelper.mk
@@ -31,13 +31,6 @@ $(patsubst %,$(stamp)binaryinst_%,$(DEB_ARCH_REGULAR_PACKAGES) $(DEB_INDEP_REGUL
dh_link -p$(curpass)
dh_bugfiles -p$(curpass)
- if test "$(curpass)" = "libc-bin"; then \
- mv debian/$(curpass)/sbin/ldconfig \
- debian/$(curpass)/sbin/ldconfig.real; \
- install -m755 -o0 -g0 debian/local/sbin/ldconfig \
- debian/$(curpass)/sbin/ldconfig; \
- fi
-
# when you want to install extra packages, use extra_pkg_install.
$(call xx,extra_pkg_install)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git
Reply to: