From: Russ Allbery <rra@debian.org>
Date: Wed, 18 Aug 2010 20:55:56 +0000 (-0700)
Subject: Merge branch 'master' into bug488214-rra
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=f1e57c2dd51829620dffb46e12271e3ec6f1f6f4;hp=90ee15294f6d5de94a1197ee45d1bd2565e06f39;p=debian%2Fdebian-policy.git

Merge branch 'master' into bug488214-rra
---

diff --git a/debian/changelog b/debian/changelog
index 743a18e..035fc26 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,11 @@ debian-policy (3.9.2.0) UNRELEASED; urgency=low
     machine.  (Closes: #591857)
   * Correct the name of the Filesystem Hierarchy Standard in the package
     description.  Patch from Christoph Anton Mitterer.  (Closes: #590696)
+  * Use the word "implemented" to describe required targets in
+    debian/rules, which is clearer about allowing wildcard rules.  List
+    the required rules in their own paragraph rather than with the
+    paragraph discussing non-interactivity, and explicitly mark all rules
+    as either required or optional.  (Closes: #536790)
 
  -- Russ Allbery <rra@debian.org>  Thu, 12 Aug 2010 10:47:47 -0700
 
diff --git a/policy.sgml b/policy.sgml
index 0624290..9037de8 100644
--- a/policy.sgml
+++ b/policy.sgml
@@ -1826,23 +1826,26 @@
           identical behavior.
 	</p>
 
+	<p>
+	  The following targets are required and must be implemented
+	  by <file>debian/rules</file>: <tt>clean</tt>, <tt>binary</tt>,
+	  <tt>binary-arch</tt>, <tt>binary-indep</tt>, and <tt>build</tt>.
+	  These are the targets called by <prgn>dpkg-buildpackage</prgn>.
+	</p>
+
 	<p>
 	  Since an interactive <file>debian/rules</file> script makes it
-	  impossible to auto-compile that package and also makes it
-	  hard for other people to reproduce the same binary
-	  package, all <em>required targets</em> must be
-	  non-interactive. At a minimum, required targets are the
-	  ones called by <prgn>dpkg-buildpackage</prgn>, namely,
-	  <em>clean</em>, <em>binary</em>, <em>binary-arch</em>,
-	  <em>binary-indep</em>, and <em>build</em>. It also follows
-	  that any target that these targets depend on must also be
+	  impossible to auto-compile that package and also makes it hard
+	  for other people to reproduce the same binary package, all
+	  required targets must be non-interactive.  It also follows that
+	  any target that these targets depend on must also be
 	  non-interactive.
 	</p>
 
 	<p>
-	  The targets are as follows (required unless stated otherwise):
+	  The targets are as follows:
 	  <taglist>
-	    <tag><tt>build</tt></tag>
+	    <tag><tt>build</tt> (required)</tag>
 	    <item>
 	      <p>
 		The <tt>build</tt> target should perform all the
@@ -1953,8 +1956,8 @@
 	      </p>
 	    </item>
 
-	    <tag><tt>binary</tt>, <tt>binary-arch</tt>,
-	      <tt>binary-indep</tt>
+	    <tag><tt>binary</tt> (required), <tt>binary-arch</tt>
+	      (required), <tt>binary-indep</tt> (required)
 	    </tag>
 	    <item>
 	      <p>
@@ -2002,7 +2005,7 @@
 	      </p>
 	    </item>
 
-	    <tag><tt>clean</tt></tag>
+	    <tag><tt>clean</tt> (required)</tag>
 	    <item>
 	      <p>
 		This must undo any effects that the <tt>build</tt>