Synchronized with patch 85 from Manojs tree

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

diff --git a/policy.sgml b/policy.sgml
index b01eb18f5587879ff6400fbadb799621bf6f926b..470d55e4c30a8d0aba3c8f69deb188a65b5ab8b8 100644 (file)
--- a/policy.sgml
+++ b/policy.sgml
@@ -2323,9 +2323,6 @@
          before (a version of) a package is removed and the
          <prgn>postrm</prgn> afterwards.
        </p>
-       <!--
-       next paragraph by Guy Maor to close bug #2481
-       -->
 
        <p> Programs called from maintainer scripts should not
          normally have a path prepended to them. Before installation
@@ -3433,10 +3430,6 @@
        files itself when building a package.
       </p>
 
-      <!--
-      next Paragraph added to close Bug #5299, Guy Maor
-      -->
-
       <p>
        Thirdly, the development package should contain a symlink for
        the shared library without a version number.  For example, the
@@ -3448,10 +3441,6 @@
        respectively.
       </p>
 
-      <!--
-      next paragraph changed by Christian Schwarz (see policy weekly #6)
-      -->
-
       <p>
        Any package installing shared libraries in a directory that's listed
        in <tt>/etc/ld.so.conf</tt> or in one of the default library
@@ -3467,10 +3456,6 @@
        installation and removes the links!
       </p>
 
-      <!--
-      moved from section 2.2 , DMorris
-      -->
-
       <sect id="shlibs"><heading>The <tt>shlibs</tt> File Format
        </heading>
 
@@ -3527,12 +3512,6 @@
       <sect><heading>Further Technical information on
          <tt>shlibs</tt></heading>
 
-
-       <!--
-       following section mostly provided by Heiko Schlittermann
-       edited by DMorris
-       -->
-
        <sect1><heading><em>What</em> are the <tt>shlibs</tt> files?
          </heading>
 
@@ -6172,32 +6151,26 @@
 
        <p>
          <em>Application defaults</em> files must be installed in the
-         directory <tt>/usr/X11R6/lib/X11/app-defaults/</tt>.
-         <footnote>
-           <p>Note: This shall change very shortly.</p>
-         </footnote>
-         They should not be registered as <em>conffile</em>s or
-         otherwise treated as configuration files.  Customization of
-         programs' X resources may be supported with the provision of
-         a file with the same name as that of the package placed in
-         the <tt>/etc/X11/Xresources/</tt> directory, which must
-         registered as a <em>conffile</em>.  <em>Important:</em>
-         packages that install files into the
-         <tt>/etc/X11/Xresources/</tt> directory <em>must</em>
-         declare a conflict with <tt>xbase (&lt;&lt;
-           3.3.2.3a-2)</tt>; if this is not done it is possible for the
-         installing package to destroy a previously-existing
-         <tt>/etc/X11/Xresources</tt> <em>file</em> which had been
-         customized by the system administrator.
-         <footnote>
-           <p>Rationale: clarifies the language to properly
-             address the package maintainer, not the system
-             administrator, as to how to manage
-             /etc/X11/Xresources.</p>
-         </footnote>
+         directory <tt>/etc/X11/app-defaults/</tt> (use of a
+         localized subdirectory of <tt>/etc/X11/</tt> as described in
+         the <em>X Toolkit Intrinsics - C Language Interface</em>
+         manual is also permitted).  They must be registered as
+         <em>conffile</em>s or handled as configuration files.  For
+         programs that are not linked against the X Toolkit (Xt)
+         library, customization of programs' X resources may also be
+         supported with the provision of a file with the same name as
+         that of the package placed in the
+         <tt>/etc/X11/Xresources/</tt> directory, which must
+         registered as a <em>conffile</em> or handled as a
+         configuration file.  <em>Important:</em> packages that
+         install files into the <tt>/etc/X11/Xresources/</tt>
+         directory <em>must</em> declare a conflict with <tt>xbase
+         (&lt;&lt; 3.3.2.3a-2)</tt>; if this is not done it is
+         possible for the installing package to destroy a
+         previously-existing <tt>/etc/X11/Xresources</tt> file which
+         had been customized by the system administrator.
        </p>
 
-
        <p>
          <em>Packages using the X Window System should abide by the FHS
            standard whenever possible</em>; they should install binaries,