Synchronized with patch 36 from Manojs tree

[debian/debian-policy.git] / policy.sgml

diff --git a/policy.sgml b/policy.sgml
index 8c95adb8d39545d3d491fa0bdd4be91f90c56175..53ec0b11b2c5d70dc8bbec1235a4f9bf8b023e57 100644 (file)
--- a/policy.sgml
+++ b/policy.sgml
@@ -138,7 +138,7 @@
          <url
          id="ftp://ftp.debian.org/debian/doc/manuals/debian-policy.html.tar.gz" name="&urlname">
          or from the Debian WWW server at
-         <url id="http://www.debian.org/doc/manuals/debian-policy/"
+         <url id="http://www.debian.org/doc/debian-policy/"
          name="&urlname"></p>
 
        <p>
@@ -503,9 +503,10 @@
 
        <p>
          The packages in all the sections (<em>main</em>,
-         <em>contrib</em>, <em>non-US</em>, and <em>non-free</em>)
-         are grouped further into <em>subsections</em> to simplify
-         handling of them.</p>
+         <em>contrib</em>, <em>non-US/main</em>, <em>non-free</em>,
+         <em>non-US/contrib</em>, and <em>non-US/non-free</em>) are
+         grouped further into <em>subsections</em> to simplify
+         handling.</p>
 
        <p>
          The section for each package is specified in the package's
@@ -2078,14 +2079,14 @@
        <p>
          An ever increasing number of packages are using libtool to
          do their linking. The latest GNU libtools (>= 1.3a) can take
-         advantage of installed libtool archive files (`*.la'). The
-         main advantage of libtool's .la files is that it allows
-         libtool to store and subsequently access metadata with
-         respect to the libraries it builds.  libtool will search for
-         those files, which contain a lot of useful information about
-         a library (e.g. dependency libraries for static
-         linking). Also, they're essential for programs using
-         libltdl.
+         advantage of the nmetadata in the installed libtool archive
+         files (`*.la'). The main advantage of libtool's .la files is
+         that it allows libtool to store and subsequently access
+         metadata with respect to the libraries it builds.  libtool
+         will search for those files, which contain a lot of useful
+         information about a library (e.g. dependency libraries for
+         static linking). Also, they're <em>essential</em> for
+         programs using libltdl.
        </p>
 
        <p>
@@ -2103,8 +2104,11 @@
        <p>
          Packages that use libtool to create shared libraries must
          include the <em>.la</em> files in the <em>-dev</em>
-         packages. This is a good idea in general, and especially
-         for static linking issues.
+         packages, with the exception that if the package relies on
+         libtool's <em>libltdl</em> library, in which case the .la
+         files must go in the run-time library package.  This is a
+         good idea in general, and especially for static linking
+         issues.
        </p>
        
        <p>
@@ -2906,18 +2910,18 @@
          <tt>/usr/include/X11/</tt>, or <tt>/usr/lib/X11/</tt>; these
          directories are actually symbolic links, which <tt>dpkg</tt>
          does not follow when unpacking a package.  Instead, use
-         <tt>/usr/X11R6/bin/</tt>, <tt>/usr/doc/package/</tt> (i.e.,
-         place files with the rest of your package's documentation),
-         <tt>/usr/X11R6/include/</tt>, and
+         <tt>/usr/X11R6/bin/</tt>, <tt>/usr/share/doc/package/</tt>
+         (i.e., place files with the rest of your package's
+         documentation), <tt>/usr/X11R6/include/</tt>, and
          <tt>/usr/X11R6/lib/</tt>.  This restriction governs only the
-         paths used by the package as it is unpacked onto the system; it
-         is permissible, and even preferable, for files within a package
-         (shell scripts, for instance) to refer to the
+         paths used by the package as it is unpacked onto the system;
+         it is permissible, and even preferable, for files within a
+         package (shell scripts, for instance) to refer to the
          <tt>/usr/{bin,include,lib}/X11/</tt> directories rather than
-         their <tt>/usr/X11R6/</tt> counterparts -- this way they do not
-         have to be modified in the event that the X Window System
-         packages install their files into a different directory in the
-         future.</p>
+         their <tt>/usr/X11R6/</tt> counterparts -- this way they do
+         not have to be modified in the event that the X Window
+         System packages install their files into a different
+         directory in the future.</p>
 
        <p>
          If you package a program that requires the (non-free)