[debhelper-devel] [debhelper] 01/01: dh_makeshlibs [compat 10]: Pass -X to ldconfig

[Niels Thykier]

This is an automated email from the git hooks/post-receive script.

nthykier pushed a commit to branch master
in repository debhelper.

commit 3543394784238e0f0c75988bb7a647fab0d8c26c
Author: Niels Thykier <niels at thykier.net>
Date:   Sun Jan 4 11:51:37 2015 +0100

    dh_makeshlibs [compat 10]: Pass -X to ldconfig
    
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 autoscripts/postinst-makeshlibs-c10 | 3 +++
 autoscripts/postrm-makeshlibs-c10   | 3 +++
 debhelper.pod                       | 7 +++++++
 debian/changelog                    | 5 +++++
 dh_makeshlibs                       | 9 +++++++--
 5 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/autoscripts/postinst-makeshlibs-c10 b/autoscripts/postinst-makeshlibs-c10
new file mode 100644
index 0000000..bab4455
--- /dev/null
+++ b/autoscripts/postinst-makeshlibs-c10
@@ -0,0 +1,3 @@
+if [ "$1" = "configure" ]; then
+	ldconfig -X
+fi
diff --git a/autoscripts/postrm-makeshlibs-c10 b/autoscripts/postrm-makeshlibs-c10
new file mode 100644
index 0000000..c81079d
--- /dev/null
+++ b/autoscripts/postrm-makeshlibs-c10
@@ -0,0 +1,3 @@
+if [ "$1" = "remove" ]; then
+	ldconfig -X
+fi
diff --git a/debhelper.pod b/debhelper.pod
index cc9989a..d1624c0 100644
--- a/debhelper.pod
+++ b/debhelper.pod
@@ -552,6 +552,13 @@ running debhelper commands. This will not affect packages that only build
 with debhelper commands, but it may expose bugs in commands not included in
 debhelper.
 
+=item -
+
+B<dh_makeshlibs> now invokes I<ldconfig -X> instead of just
+I<ldconfig> in its generated maintainer scripts snippets.  The new
+call will only update the ld cache (instead of also updating
+symlinks).
+
 =back
 
 =back
diff --git a/debian/changelog b/debian/changelog
index 2858087..8e23034 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -42,6 +42,11 @@ debhelper (9.20150101.1) UNRELEASED; urgency=medium
     files.  Thanks to Axel Beckert for the report.  (Closes: #698500)
   * d/rules: Remove makefile target only intended for/used by the
     previous maintainer.
+  * dh_makeshlibs: In compat 10+, pass "-X" to ldconfig to
+    only  regenerate the cache (instead of also creating missing
+    symlinks).  Thanks to Joss Mouette for the suggestion.
+    (Closes: #549990)
+  * autoscripts/post{inst,rm}-makeshlibs-c10: New files.
 
   [ Bernhard R. Link ]
   * Dh_lib: apply patch from Guillem Jover to support case-insensitive
diff --git a/dh_makeshlibs b/dh_makeshlibs
index 5ff7451..ccb73b6 100755
--- a/dh_makeshlibs
+++ b/dh_makeshlibs
@@ -224,8 +224,13 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 
 	# New as of dh_v3.
 	if (! compat(2) && ! $dh{NOSCRIPTS} && $need_ldconfig) {
-		autoscript($package,"postinst","postinst-makeshlibs");
-		autoscript($package,"postrm","postrm-makeshlibs");
+		if (compat(9)) {
+			autoscript($package,"postinst","postinst-makeshlibs");
+			autoscript($package,"postrm","postrm-makeshlibs");
+		} else {
+			autoscript($package,"postinst","postinst-makeshlibs-c10");
+			autoscript($package,"postrm","postrm-makeshlibs-c10");
+		}
 	}
 
 	if (-e "$tmp/DEBIAN/shlibs") {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debhelper/debhelper.git