Merge branch 'master' into bug504880-rra

diff --git a/debian/changelog b/debian/changelog
index 1d3600b460c58d1336cc2f3e10ca464489261dc2..92264b2cdb7ab01cbcd6d0d9dcfcd6496d3bd493 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -40,10 +40,6 @@ debian-policy (3.9.1.0) UNRELEASED; urgency=low
     package.
   * Explain the Perl module package naming policy more explicitly and
     provide some examples.  (Closes: #175202)
-  * Add Pre-Depends and Build-Depends-Indep to the relationships not
-    allowed from main to contrib or non-free and mention that such
-    relationships are okay if the non-free package is only an
-    alternative.  Thanks, Raphael Geissert.  (Closes: #587279)
   * Revise the footnote discussing shlibs creation to not talk about the
     switch to objdump as if it were a new innovation and to explicitly
     mention the NEEDED attribute as the source of dependency information.

diff --git a/policy.sgml b/policy.sgml
index ac4cb69528d22285d6e00f963d0c4e169d8a083e..32bbd9e44714f135b5b8a7684437b0acd94c7aff 100644 (file)
--- a/policy.sgml
+++ b/policy.sgml
@@ -476,11 +476,9 @@
              <item>
                  must not require a package outside of <em>main</em>
                  for compilation or execution (thus, the package must
-                 not declare a <tt>Pre-Depends</tt>, <tt>Depends</tt>,
-                 <tt>Recommends</tt>, <tt>Build-Depends</tt>,
-                 or <tt>Build-Depends-Indep</tt> relationship on a
-                 non-<em>main</em> package unless a package
-                 in <em>main</em> is listed as an alternative),
+                 not declare a "Depends", "Recommends", or
+                 "Build-Depends" relationship on a non-<em>main</em>
+                 package),
              </item>
              <item>
                  must not be so buggy that we refuse to support them,