Update the ldconfig footnote listing /etc/ld.so.conf directories

* Update the ldconfig footnote listing the /etc/ld.so.conf directories
  to remove the libc5 compatibility directories and mention the
  multiarch triplet directories.  Based on a patch by Charles Plessy.
  (Closes: #597074)

diff --git a/debian/changelog b/debian/changelog
index aa4fbfcc12dbea94e0e19f73741378b66333b652..ab01bb80eb8047d33b92d5873a01b23cf752a8a5 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,10 @@ debian-policy (3.9.2.0) UNRELEASED; urgency=low
     the required rules in their own paragraph rather than with the
     paragraph discussing non-interactivity, and explicitly mark all rules
     as either required or optional.  (Closes: #536790)
+  * Update the ldconfig footnote listing the /etc/ld.so.conf directories
+    to remove the libc5 compatibility directories and mention the
+    multiarch triplet directories.  Based on a patch by Charles Plessy.
+    (Closes: #597074)
   * Change all non-historical references to Debian GNU/Linux to simply
     Debian since Debian now includes FreeBSD-based architectures.  Patch
     from Guillem Jover.  (Closes: #594656)

diff --git a/policy.sgml b/policy.sgml
index 6455f699b8d5c9da934a1f60196683c6c05add7e..382a7dab56e0884c4687b074e329dab3647b01c0 100644 (file)
--- a/policy.sgml
+++ b/policy.sgml
@@ -5365,12 +5365,9 @@ Replaces: mail-transport-agent
          library directories of the dynamic linker (which are currently
          <file>/usr/lib</file> and <file>/lib</file>) or a directory that is
          listed in <file>/etc/ld.so.conf</file><footnote>
-           These are currently
-           <list compact="compact">
-             <item>/usr/local/lib</item>
-             <item>/usr/lib/libc5-compat</item>
-             <item>/lib/libc5-compat</item>
-           </list>
+           These are currently <file>/usr/local/lib</file> plus
+           directories under <file>/lib</file> and <file>/usr/lib</file>
+           matching the multiarch triplet for the system architecture.
          </footnote>
          must use <prgn>ldconfig</prgn> to update the shared library
          system.