Merge branch 'master' into bug575639-rra

Conflicts:
	debian/changelog

diff --git a/debian/changelog b/debian/changelog
index 3dea6a44a2a073884ae59333a661bd6b1b463fff..73a9b56dce1c7371134cdda8dbfe1ba18a1129d6 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -73,6 +73,11 @@ debian-policy (3.8.5.0) UNRELEASED; urgency=low
     Seconded: Julien Cristau <jcristau@debian.org>
     Seconded: Andrew McMillan <andrew@morphoss.com>
     Closes: #347581
+  * Policy: Tighten requirements for maintainer-like fields
+    Wording: Russ Allbery <rra@debian.org>
+    Seconded: Emilio Pozuelo Monfort <pochu@debian.org>
+    Seconded: Andrew McMillan <andrew@morphoss.com>
+    Closes: #575639
   * Perl Policy: Change perlapi provides to use an ABI version
     Wording: Niko Tyni <ntyni@debian.org>
     Seconded: Russ Allbery <rra@debian.org>

diff --git a/policy.sgml b/policy.sgml
index 439786cfa687ae6c01b9dd884dc49a962b80b1a8..8aa51e7875bab84f0185d6c574bc71f2f763a0da 100644 (file)
--- a/policy.sgml
+++ b/policy.sgml
@@ -2672,8 +2672,8 @@ Package: libc6
 
          <p>
            The package maintainer's name and email address.  The name
-           should come first, then the email address inside angle
-           brackets <tt>&lt;&gt</tt> (in RFC822 format).
+           must come first, then the email address inside angle
+           brackets <tt>&lt;&gt;</tt> (in RFC822 format).
          </p>
 
          <p>
@@ -2690,17 +2690,17 @@ Package: libc6
        <sect1 id="f-Uploaders">
           <heading><tt>Uploaders</tt></heading>
 
-          <p>
-            List of the names and email addresses of co-maintainers of
-            the package, if any. If the package has other maintainers
-            beside the one named in the 
-            <qref id="f-Maintainer">Maintainer field</qref>, their
-            names and email addresses should be listed here. The
-            format is the same as that of the Maintainer tag, and
-            multiple entries should be comma separated. Currently,
-            this field is restricted to a single line of data.  This
-            is an optional field.
-          </p>
+         <p>
+           List of the names and email addresses of co-maintainers of
+           the package, if any. If the package has other maintainers
+           beside the one named in the
+           <qref id="f-Maintainer">Maintainer field</qref>, their names
+           and email addresses should be listed here. The format of each
+           entry is the same as that of the Maintainer field, and
+           multiple entries must be comma separated.  This is an optional
+           field.
+         </p>
+
          <p>
            Any parser that interprets the Uploaders field in
            <file>debian/control</file> must permit it to span multiple
@@ -2714,9 +2714,10 @@ Package: libc6
          <heading><tt>Changed-By</tt></heading>
 
          <p>
-           The name and email address of the person who changed the
-           said package. Usually the name of the maintainer.
-           All the rules for the Maintainer field apply here, too.
+           The name and email address of the person who prepared this
+           version of the package, usually a maintainer.  The syntax is
+           the same as for the <qref id="f-Maintainer">Maintainer
+           field</qref>.
          </p>
        </sect1>
 

diff --git a/upgrading-checklist.sgml b/upgrading-checklist.sgml
index 394d9c69ff0f822fc69caa729e51e60b193608bf..9f0d966102a783bc0f0064e3824f4e35ae0cf943 100644 (file)
--- a/upgrading-checklist.sgml
+++ b/upgrading-checklist.sgml
@@ -53,6 +53,14 @@ Release Jun 2010.
   and <tt>Checksums-Sha256</tt> fields in <file>*.dsc</file>
   and <file>*.changes</file> files.
   </item>
+<tag>5.6.2</tag>
+  <item>The syntax of the <tt>Maintainer</tt> field is now must rather
+  than should.
+  </item>
+<tag>5.6.3</tag>
+  <item>The comma separating entries in <tt>Uploaders</tt> is now must
+  rather than should.
+  </item>
 <tag>5.6.8, 7.1, 11.1.1</tag>
   <item>Architecture wildcards may be used in addition to specific
   architectures in <file>debian/control</file> and <file>*.dsc</file>