Merge branch 'master' into bug459868-rra

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

diff --git a/policy.sgml b/policy.sgml
index b1f946aed6cfb2de98335a385e0956277375d9d6..d56ca683552161c051dd1bbddb61484411b9f722 100644 (file)
--- a/policy.sgml
+++ b/policy.sgml
@@ -958,7 +958,7 @@
 
        <p>
          If the maintainer of a package no longer has time or desire to
-         maintain a package, it will be orphaned according to the
+         maintain a package, it should be orphaned according to the
          procedure described in the Debian Developer's Reference
          (see <ref id="related">).  The maintainer then
          becomes <tt>Debian QA Group &lt;packages@qa.debian.org&gt;</tt>.
@@ -2240,16 +2240,16 @@ endif
        <heading>Variable substitutions: <file>debian/substvars</file></heading>
 
        <p>
-         When <prgn>dpkg-gencontrol</prgn>,
-         <prgn>dpkg-genchanges</prgn> and <prgn>dpkg-source</prgn>
-         generate control files, they perform variable substitutions
-         on their output just before writing it.  Variable
+         When <prgn>dpkg-gencontrol</prgn>
+         generates <qref id="binarycontrolfiles">binary package control
+         files</qref> (<file>DEBIAN/control</file>), it performs variable
+         substitutions on its output just before writing it.  Variable
          substitutions have the form <tt>${<var>variable</var>}</tt>.
          The optional file <file>debian/substvars</file> contains
          variable substitutions to be used; variables can also be set
          directly from <file>debian/rules</file> using the <tt>-V</tt>
-         option to the source packaging commands, and certain
-         predefined variables are also available.
+         option to the source packaging commands, and certain predefined
+         variables are also available.
        </p>
 
        <p>
@@ -5529,6 +5529,14 @@ Replaces: mail-transport-agent
        (<prgn>ld</prgn>) when compiling packages, as it will only look for
        <file>libgdbm.so</file> when compiling dynamically.
       </p>
+
+      <p>
+       If the package provides Ada Library Information
+       (<file>*.ali</file>) files for use with GNAT, these files must be
+       installed read-only (mode 0444) so that GNAT will not attempt to
+       recompile them.  This overrides the normal file mode requirements
+       given in <ref id="permissions-owners">.
+      </p>
       </sect>
 
       <sect id="sharedlibs-intradeps">
@@ -8087,7 +8095,7 @@ endscript
        </p>
       </sect>
 
-      <sect>
+      <sect id="permissions-owners">
        <heading>Permissions and owners</heading>
 
        <p>