From: Russ Allbery <rra@debian.org>
Date: Tue, 1 Jan 2008 23:12:55 +0000 (+0000)
Subject: Support for wrapped Uploaders is mandatory, clarify wrapping
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=5bd5074eb59d337e44d4040cd92f9db1dc10217c;p=debian%2Fdebian-policy.git

Support for wrapped Uploaders is mandatory, clarify wrapping

Support for wrapping Uploaders in debian/control is now mandatory since
the stable dpkg supports it.

Clarify that all relationship fields may be wrapped and provide a
suggestion for where to wrap them.

git-archimport-id: rra@debian.org--lenny/debian-policy--devel--3.7--patch-28
---

diff --git a/debian/changelog b/debian/changelog
index 015851f..2217a62 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 debian-policy (3.7.4.0) unstable; urgency=low
 
+  * Bug fix: "support for wrapped Uploaders should now be mandatory"
+                                                             (Closes: #431813).
   * Bug fix: "Examples of dpkg frontends should mention apt now", thanks
     to Josh Triplett                                         (Closes: #455602).
   * Bug fix: "Minor typos and wording suggestions", thanks to Michael
diff --git a/policy.sgml b/policy.sgml
index f976cd6..dd673ac 100644
--- a/policy.sgml
+++ b/policy.sgml
@@ -2391,16 +2391,10 @@ Package: libc6
           </p>
 	  <p>
 	    Any parser that interprets the Uploaders field in
-	    <file>debian/control</file> should permit it to span multiple
-	    lines<footnote>
-              In the future, the Uploaders field in
-		<file>debian/control</file> (but not other control files)
-		will be permitted to span multiple lines and interpreting
-		a multi-line Uploaders field shall be mandatory.
-	    </footnote>. Line breaks in an Uploaders field that spans
-	    multiple lines are not significant and the semantics of
-	    the field are the same as if the line breaks had not been
-	    present.
+	    <file>debian/control</file> must permit it to span multiple
+	    lines.  Line breaks in an Uploaders field that spans multiple
+	    lines are not significant and the semantics of the field are
+	    the same as if the line breaks had not been present.
 	  </p>
  	</sect1>
 
@@ -3891,13 +3885,16 @@ Package: libc6
 	  Whitespace may appear at any point in the version
 	  specification subject to the rules in <ref
 	  id="controlsyntax">, and must appear where it's necessary to
-	  disambiguate; it is not otherwise significant.  For
+	  disambiguate; it is not otherwise significant.  All of the
+	  relationship fields may span multiple lines.	For
 	  consistency and in case of future changes to
 	  <prgn>dpkg</prgn> it is recommended that a single space be
 	  used after a version relationship and before a version
 	  number; it is also conventional to put a single space after
 	  each comma, on either side of each vertical bar, and before
-	  each open parenthesis.
+	  each open parenthesis.  When wrapping a relationship field, it
+	  is conventional to do so after a comma and before the space
+	  following that comma.
 	</p>
 
 	<p>
diff --git a/upgrading-checklist.html b/upgrading-checklist.html
index 65fd16a..0be5ddc 100644
--- a/upgrading-checklist.html
+++ b/upgrading-checklist.html
@@ -53,6 +53,8 @@ picking your way through this list.
 <h2>The checklist</h2>
 
 <pre>
+3.7.4.0                        unreleased
+     * The Uploaders field in debian/control may be wrapped.     [5.6.3]
 3.7.3.0                        Dec 2007
      * Package version numbers may contain tildes, which sort before
        anything, even the end of a part.                         [5.6.12]