Merge branch 'master' into bug519941-rra

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

diff --git a/policy.sgml b/policy.sgml
index 27de758229354f4891bc3cf1b45c5a415947cd77..7a0b088996e5562a67fb0349a31de7ec2f14080b 100644 (file)
--- a/policy.sgml
+++ b/policy.sgml
@@ -24,6 +24,13 @@
          Copyright © 1996,1997,1998 Ian Jackson
          and Christian Schwarz.
        </copyrightsummary>
+       <p>
+         These are the copyright dates of the original Policy manual.
+         Since then, this manual has been updated by many others.  No
+         comprehensive collection of copyright notices for subsequent
+         work exists.
+       </p>
+
        <p>
          This manual is free software; you may redistribute it and/or
          modify it under the terms of the GNU General Public License
@@ -3284,16 +3291,17 @@ Package: libc6
          <heading><tt>Installed-Size</tt></heading>
 
          <p>
-           This field appears in the control files of binary
-           packages, and in the <file>Packages</file> files.  It gives
-           the total amount of disk space required to install the
-           named package.
+           This field appears in the control files of binary packages,
+           and in the <file>Packages</file> files.  It gives an
+           estimation the total amount of disk space required to install
+           the named package.  Actual installed size may vary based on
+           block size, file system properties, or actions taken by
+           package maintainer scripts.
          </p>
 
          <p>
-           The disk space is given as the integer value of the installed
-           size divided by 1024 (in other words, the size in kibibytes)
-           and rounded up.
+           The disk space is given as the integer value of the estimated
+           installed size in bytes, divided by 1024 and rounded up.
          </p>
        </sect1>
 
@@ -6974,17 +6982,6 @@ strip --strip-unneeded <var>your-lib</var>
          </footnote>
        </p>
 
-       <p>
-         Packages containing shared libraries that may be linked to
-         by other packages' binaries, but which for some
-         <em>compelling</em> reason can not be installed in
-         <file>/usr/lib</file> directory, may install the shared library
-         files in subdirectories of the <file>/usr/lib</file> directory,
-         in which case they should arrange to add that directory in
-         <file>/etc/ld.so.conf</file> in the package's post-installation
-         script, and remove it in the package's post-removal script.
-       </p>
-
        <p>
          An ever increasing number of packages are using
          <prgn>libtool</prgn> to do their linking.  The latest GNU