diff options
| -rw-r--r-- | autoscripts/postinst-makeshlibs-c10 | 3 | ||||
| -rw-r--r-- | autoscripts/postrm-makeshlibs-c10 | 3 | ||||
| -rw-r--r-- | debhelper.pod | 7 | ||||
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rwxr-xr-x | dh_makeshlibs | 9 |
5 files changed, 5 insertions, 20 deletions
diff --git a/autoscripts/postinst-makeshlibs-c10 b/autoscripts/postinst-makeshlibs-c10 deleted file mode 100644 index bab4455b..00000000 --- a/autoscripts/postinst-makeshlibs-c10 +++ /dev/null @@ -1,3 +0,0 @@ -if [ "$1" = "configure" ]; then - ldconfig -X -fi diff --git a/autoscripts/postrm-makeshlibs-c10 b/autoscripts/postrm-makeshlibs-c10 deleted file mode 100644 index c81079d0..00000000 --- a/autoscripts/postrm-makeshlibs-c10 +++ /dev/null @@ -1,3 +0,0 @@ -if [ "$1" = "remove" ]; then - ldconfig -X -fi diff --git a/debhelper.pod b/debhelper.pod index 1e28e601..480e293c 100644 --- a/debhelper.pod +++ b/debhelper.pod @@ -554,13 +554,6 @@ 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). - -=item - - B<dh_installdeb> no longer installs a maintainer-provided debian/I<package>.shlibs file. This is now done by B<dh_makeshlibs> instead. diff --git a/debian/changelog b/debian/changelog index 64470afa..5feb906e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,9 @@ debhelper (9.20150811+unreleased) UNRELEASED; urgency=medium files even if the package has no sysvinit script or explicit debian/<package>.service file. (Closes: #795519) + * dh_makeshlibs: Revert passing -X to ldconfig in compat 10 + after talking with the glibc maintainer. The is not the + right place to make this change. [ Paul Tagliamonte ] * dh_gencontrol: Put debug debs back in the "debug" section. diff --git a/dh_makeshlibs b/dh_makeshlibs index 079ac126..a0b3253d 100755 --- a/dh_makeshlibs +++ b/dh_makeshlibs @@ -232,13 +232,8 @@ foreach my $package (@{$dh{DOPACKAGES}}) { # New as of dh_v3. if (! compat(2) && ! $dh{NOSCRIPTS} && $need_ldconfig) { - 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"); - } + autoscript($package,"postinst","postinst-makeshlibs"); + autoscript($package,"postrm","postrm-makeshlibs"); } if ($shlibs_file) { |