Shared library handling changes due to forthcoming dpkg changes

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

diff --git a/policy.sgml b/policy.sgml
index 9be3fb321697d06293b67c7922abbfeb645bd52e..28a3399c89c1ad4a1cb5335b6dca62ff6bf9a33e 100644 (file)
--- a/policy.sgml
+++ b/policy.sgml
@@ -60,6 +60,9 @@
          <item>
            <p>Philip Hands <email>phil@hands.com</email></p>
          </item>
+         <item>
+           <p>Julian Gilbey <email>J.D.Gilbey@qmw.ac.uk</email></p>
+         </item>
          <item>
            <p>Manoj Srivastava <email>srivasta@debian.org</email></p>
          </item>
@@ -92,7 +95,7 @@
          <tt>/usr/share/common-licences/GPL</tt> in the Debian GNU/Linux
          distribution or on the World Wide Web at 
          <url id="http://www.gnu.org/copyleft/gpl.html" 
-         name="&urlname">. You can also obtain it by writing to the
+         name="The GNU Public Licence">. You can also obtain it by writing to the
          Free Software Foundation, Inc., 59 Temple Place - Suite 330,
          Boston, MA 02111-1307, USA.
        </p>
@@ -138,10 +141,10 @@
        <p>
          The current version of this document is always accessible from the
          Debian FTP server <ftpsite>ftp.debian.org</ftpsite> at
-         <ftppath>/debian/doc/manuals/debian-policy.html.tar.gz</ftppath>
+         <ftppath>/debian/doc/package-developer/debian-policy.html.tar.gz</ftppath>
          or from the Debian WWW server at
          <url id="http://www.debian.org/doc/debian-policy/"
-         name="&urlname">.</p>
+         name="The Debian Policy Manual">.</p>
 
        <p>
          In addition, this manual is distributed via the Debian package
@@ -589,8 +592,9 @@
          
        <p>
          Packages may not depend on packages with lower priority
-         values (excluding build-time dependencies).  If this does
-         happen, one of the priority values will have to be adapted.
+         values (excluding build-time dependencies).  In order to
+         ensure this, the priorities of one or more packages may have
+         to be adjusted.
        </p>
       </sect>
          
@@ -2559,6 +2563,21 @@
            maintainer scripts during installation (or at any other
            time).</p>
 
+         <p>
+           In order to ensure that local changes are preserved
+           correctly, no package may contain or make hard links to
+           conffiles.
+           <footnote>
+             <p>
+               Rationale: There are two problems with hard links.
+               The first is that some editors break the link while
+               editing one of the files, so that the two files may
+               unwittingly become different.  The second is that
+               <prgn>dpkg</prgn> might break the hard link while
+               upgrading <tt>conffile</tt>s.
+             </p>
+           </footnote>
+
          <p>
            The other way to do it is to via the maintainer scripts.
            In this case, the configuration file must not be listed as
@@ -2600,6 +2619,7 @@
            not be mixed</em>, for that way lies madness:
            <prgn>dpkg</prgn> will ask about overwriting the file
            every time the package is upgraded.</p>
+
        </sect1>
 
        <sect1>
@@ -3300,8 +3320,9 @@
            </item>
            <item>
                Type 1 fonts should be placed in
-               /usr/X11R6/lib/X11/fonts/Type1/</tt>.  If font metric files are
-               available, they may be placed here as well.
+               <tt>/usr/X11R6/lib/X11/fonts/Type1/</tt>.  If font
+               metric files are available, they may be placed here as
+               well.
            </item>
            <item>
                Subdirectories of <tt>/usr/X11R6/lib/X11/fonts/</tt>