Merge branch 'master' into bug620870-rra

diff --git a/debian/changelog b/debian/changelog
index b7b3df0e652d4ed6b3bafaf451839a6a60314335..1422ad7b193822fa58dd44ddeca1607114063bed 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -51,6 +51,11 @@ debian-policy (3.9.3.0) UNRELEASED; urgency=low
   * Resynchronize the archive section list with ftp-master, adding
     education, introspection, and metapackages.  Patch from Charles
     Plessy.  (Closes: #651020)
+  * Clarify that packages in main may not declare Pre-Depends or
+    Build-Depends-Indep relationships outside of main either.  Partly
+    addresses #587279.
+  * Fix typo in the version numbers in the dpkg-divert examples.  Thanks,
+    Slavko.
   * Add the release date of 3.9.2.0 to upgrading-checklist.
   * Fix ordering of the last entries in the 3.9.2.0 upgrading-checklist.
   * Fix typo in upgrading-checklist entry for multiarch paths.  Thanks,

diff --git a/policy.sgml b/policy.sgml
index 8834ece206bab7e1e8710eb9d017151f88ed12bb..6ae5474e01a53cb214f70e91a56ccb82591a4c93 100644 (file)
--- a/policy.sgml
+++ b/policy.sgml
@@ -489,9 +489,9 @@
              <item>
                  must not require or recommend a package outside
                  of <em>main</em> for compilation or execution (thus, the
-                 package must not declare a "Depends", "Recommends", or
-                 "Build-Depends" relationship on a non-<em>main</em>
-                 package),
+                 package must not declare a "Pre-Depends", "Depends",
+                 "Recommends", "Build-Depends", or "Build-Depends-Indep"
+                 relationship on a non-<em>main</em> package),
              </item>
              <item>
                  must not be so buggy that we refuse to support them,
@@ -11369,7 +11369,7 @@ END-INFO-DIR-ENTRY
      dpkg-divert --package smailwrapper --remove --rename \
         --divert /usr/sbin/smail.real /usr/sbin/smail
   fi
-       </example> where <tt>1.02-2</tt> is the version at which the
+       </example> where <tt>1.0-2</tt> is the version at which the
        diversion was first added to the package.  The postrm should not
        remove the diversion on upgrades both because there's no reason to
        remove the diversion only to immediately re-add it and since the