From: Russ Allbery <rra@debian.org>
Date: Sun, 19 Sep 2010 02:55:35 +0000 (-0700)
Subject: Update the ldconfig footnote listing /etc/ld.so.conf directories
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=a16f225371a63c1bae573753cc562b8016923886;p=debian%2Fdebian-policy.git

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 aa4fbfc..ab01bb8 100644
--- 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 6455f69..382a7da 100644
--- 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.