Merge branch 'master' into bug504880-rra

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

diff --git a/policy.sgml b/policy.sgml
index eb458fe606f303d581d009aefa13922669e33a2b..a7747eca93e3def70e3ea3612d72ff02c3a6a998 100644 (file)
--- a/policy.sgml
+++ b/policy.sgml
@@ -1079,9 +1079,9 @@
        </p>
 
        <p>
-         Sometimes, a package requires another package to be unpacked
-         <em>and</em> configured before it can be unpacked.  In this
-         case, the dependent package must specify this dependency in
+         Sometimes, unpacking one package requires that another package
+         be first unpacked <em>and</em> configured.  In this case, the
+         dependent package must specify this dependency in
          the <tt>Pre-Depends</tt> control field.
        </p>
 
@@ -5566,6 +5566,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">
@@ -8124,7 +8132,7 @@ endscript
        </p>
       </sect>
 
-      <sect>
+      <sect id="permissions-owners">
        <heading>Permissions and owners</heading>
 
        <p>