X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=policy.sgml;h=10e626babf857a9c1b25e56444ae3d75f9f12e2c;hb=bce4b938b4e603a7bceeaf2ad31d007d0a9dcb43;hp=5760a3f6621cde4cf10492bad8cdafb1df9a49f4;hpb=0fd03bb3692fc5a385bb332266bc5f41b34c75d5;p=debian%2Fdebian-policy.git

diff --git a/policy.sgml b/policy.sgml
index 5760a3f..10e626b 100644
--- a/policy.sgml
+++ b/policy.sgml
@@ -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>
 
 
@@ -6623,7 +6634,7 @@ Built-Using: grub2 (= 1.99-9), loadlin (= 1.6e-1)
 	  <heading>The <tt>shlibs</tt> system</heading>
 
 	  <p>
-	    The <tt>shlibs</tt> system is an simpler alternative to
+	    The <tt>shlibs</tt> system is a simpler alternative to
 	    the <tt>symbols</tt> system for declaring dependencies for
 	    shared libraries.  It may be more appropriate for C++
 	    libraries and other cases where tracking individual symbols is