X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=policy.sgml;h=73b8d6a4deeb0dcc5e885fd5cc388f899b2d5346;hb=6b71dce45c85d443ac478005d7107351db2b6119;hp=203e5ad06db876c278de2bdefbd9b26762efd934;hpb=e233e13e68f74e41782a58a596c550a722b11d91;p=debian%2Fdebian-policy.git

diff --git a/policy.sgml b/policy.sgml
index 203e5ad..73b8d6a 100644
--- a/policy.sgml
+++ b/policy.sgml
@@ -1729,7 +1729,7 @@ zope.
 /closes:\s*(?:bug)?\#?\s?\d+(?:,\s*(?:bug)?\#?\s?\d+)*/i
 	      </example>
 	      Then all of the bug numbers listed will be closed by the
-	      archive maintenance script (<prgn>katie</prgn>) using the
+	      archive maintenance software (<prgn>dak</prgn>) using the
 	      <var>version</var> of the changelog entry.
 	  </footnote>
 	  This information is conveyed via the <tt>Closes</tt> field
@@ -2649,7 +2649,6 @@ Package: libc6
 	    <item><qref id="f-Source"><tt>Source</tt></qref> (mandatory)</item>
 	    <item><qref id="f-Maintainer"><tt>Maintainer</tt></qref> (mandatory)</item>
 	    <item><qref id="f-Uploaders"><tt>Uploaders</tt></qref></item>
-	    <item><qref id="f-DM-Upload-Allowed"><tt>DM-Upload-Allowed</tt></qref></item>
 	    <item><qref id="f-Section"><tt>Section</tt></qref> (recommended)</item>
 	    <item><qref id="f-Priority"><tt>Priority</tt></qref> (recommended)</item>
 	    <item><qref id="sourcebinarydeps"><tt>Build-Depends</tt> et al</qref></item>
@@ -2748,13 +2747,12 @@ Package: libc6
 	  <item><qref id="f-Version"><tt>Version</tt></qref> (mandatory)</item>
 	  <item><qref id="f-Maintainer"><tt>Maintainer</tt></qref> (mandatory)</item>
 	  <item><qref id="f-Uploaders"><tt>Uploaders</tt></qref></item>
-	  <item><qref id="f-DM-Upload-Allowed"><tt>DM-Upload-Allowed</tt></qref></item>
 	  <item><qref id="f-Homepage"><tt>Homepage</tt></qref></item>
 	  <item><qref id="f-VCS-fields"><tt>Vcs-Browser</tt>, <tt>Vcs-Git</tt>, et al.</qref></item>
 	  <item><qref id="f-Standards-Version"><tt>Standards-Version</tt></qref> (recommended)</item>
 	  <item><qref id="sourcebinarydeps"><tt>Build-Depends</tt> et al</qref></item>
 	  <item><qref id="f-Checksums"><tt>Checksums-Sha1</tt>
-	      and <tt>Checksums-Sha256</tt></qref> (recommended)</item>
+	      and <tt>Checksums-Sha256</tt></qref> (mandatory)</item>
 	  <item><qref id="f-Files"><tt>Files</tt></qref> (mandatory)</item>
 	</list>
 	</p>
@@ -2807,7 +2805,7 @@ Package: libc6
 	    <item><qref id="f-Closes"><tt>Closes</tt></qref></item>
 	    <item><qref id="f-Changes"><tt>Changes</tt></qref> (mandatory)</item>
 	    <item><qref id="f-Checksums"><tt>Checksums-Sha1</tt>
-		and <tt>Checksums-Sha256</tt></qref> (recommended)</item>
+		and <tt>Checksums-Sha256</tt></qref> (mandatory)</item>
 	    <item><qref id="f-Files"><tt>Files</tt></qref> (mandatory)</item>
 	  </list>
 	</p>
@@ -3741,28 +3739,19 @@ Checksums-Sha256:
 	  </p>
 
 	  <p>
-	    In the <file>.dsc</file> file, these fields should list all
+	    In the <file>.dsc</file> file, these fields list all
 	    files that make up the source package.  In
-	    the <file>.changes</file> file, these fields should list all
+	    the <file>.changes</file> file, these fields list all
 	    files being uploaded.  The list of files in these fields
 	    must match the list of files in the <tt>Files</tt> field.
 	  </p>
 	</sect1>
 
-	<sect1 id="f-DM-Upload-Allowed">
+	<sect1>
 	  <heading><tt>DM-Upload-Allowed</tt></heading>
 
 	  <p>
-	    Indicates that Debian Maintainers may upload this package to
-	    the Debian archive.  The only valid value is <tt>yes</tt>.  If
-	    the field <tt>DM-Upload-Allowed: yes</tt> is present in the
-	    source section of the source control file of the most recent
-	    version of a package in unstable or experimental, the Debian
-	    archive will accept uploads of this package signed with a key
-	    in the Debian Maintainer keyring.  See the General
-	    Resolution <url id="http://www.debian.org/vote/2007/vote_003"
-	    name="Endorse the concept of Debian Maintainers"> for more
-	    details.
+	    Obsolete, see <qref id="f-DM-Upload-Allowed">below</qref>.
 	  </p>
 	</sect1>
 
@@ -3858,6 +3847,28 @@ Checksums-Sha256:
 
       </sect>
 
+      <sect id="obsolete-control-data-fields">
+	<heading>Obsolete fields</heading>
+
+	<p>
+	  The following fields have been obsoleted and may be found in packages
+	  conforming with previous versions of the Policy.
+	</p>
+
+	<sect1 id="f-DM-Upload-Allowed">
+	  <heading><tt>DM-Upload-Allowed</tt></heading>
+
+	  <p>
+	    Indicates that Debian Maintainers may upload this package to
+	    the Debian archive.  The only valid value is <tt>yes</tt>.  This
+	    field was used to regulate uploads by Debian Maintainers, See the
+	    General Resolution <url id="http://www.debian.org/vote/2007/vote_003"
+	    name="Endorse the concept of Debian Maintainers"> for more details.
+	  </p>
+	</sect1>
+
+      </sect>
+
     </chapt>