From: Russ Allbery
Date: Sun, 13 Jun 2010 19:30:48 +0000 (-0700)
Subject: Merge branch 'master' into bug478295-rra
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=229a09b599841d8cc4c077d68c4e1f4dff3bc44e;hp=7b23de903d3ba7734e23bae91d85b92a18a1f120;p=debian%2Fdebian-policy.git
Merge branch 'master' into bug478295-rra
---
diff --git a/debian/changelog b/debian/changelog
index 221e9d6..7607d9e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -57,6 +57,11 @@ debian-policy (3.8.5.0) UNRELEASED; urgency=low
Seconded: Jakub Wilk
Seconded: gregor herrmann
Closes: #284340
+ * Policy: Document Checksums-Sha1 and Checksums-Sha256
+ Wording: Russ Allbery
+ Seconded: Julien Cristau
+ Seconded: Emilio Pozuelo Monfort
+ Closes: #478295
* Perl Policy: Change perlapi provides to use an ABI version
Wording: Niko Tyni
Seconded: Russ Allbery
diff --git a/policy.sgml b/policy.sgml
index c160672..0b5fc8b 100644
--- a/policy.sgml
+++ b/policy.sgml
@@ -2488,8 +2488,6 @@ Package: libc6
The syntax and semantics of the fields are described below.
-
-
These fields are used by dpkg-gencontrol to
generate control files for binary packages (see below), by
@@ -2563,15 +2561,17 @@ Package: libc6
- Format (mandatory)
- Source (mandatory)
+ - Binary
+ - Architecture
- Version (mandatory)
- Maintainer (mandatory)
- Uploaders
- - Binary
- - Architecture
- - Build-Depends et al
+ - Homepage
- Standards-Version (recommended)
+ - Build-Depends et al
+ - Checksums-Sha1
+ and Checksums-Sha256 (recommended)
- Files (mandatory)
- - Homepage
@@ -2615,6 +2615,8 @@ Package: libc6
- Description (mandatory)
- Closes
- Changes (mandatory)
+ - Checksums-Sha1
+ and Checksums-Sha256 (recommended)
- Files (mandatory)
@@ -3472,6 +3474,51 @@ Files:
+
+ Checksums-Sha1
+ and Checksums-Sha256
+
+
+ These fields contain a list of files with a checksum and size
+ for each one. Both Checksums-Sha1
+ and Checksums-Sha256 have the same syntax and differ
+ only in the checksum algorithm used: SHA-1
+ for Checksums-Sha1 and SHA-256
+ for Checksums-Sha256.
+
+
+
+ Checksums-Sha1 and Checksums-Sha256 are
+ multiline fields. The first line of the field value (the part
+ on the same line as Checksums-Sha1:
+ or Checksums-Sha256:) is always empty. The content
+ of the field is expressed as continuation lines, one line per
+ file. Each line consists of the checksum, a space, the file
+ size, a space, and the file name. For example (from
+ a .changes file):
+
+Checksums-Sha1:
+ 1f418afaa01464e63cc1ee8a66a05f0848bd155c 1276 example_1.0-1.dsc
+ a0ed1456fad61116f868b1855530dbe948e20f06 171602 example_1.0.orig.tar.gz
+ 5e86ecf0671e113b63388dac81dd8d00e00ef298 6137 example_1.0-1.debian.tar.gz
+ 71a0ff7da0faaf608481195f9cf30974b142c183 548402 example_1.0-1_i386.deb
+Checksums-Sha256:
+ ac9d57254f7e835bed299926fd51bf6f534597cc3fcc52db01c4bffedae81272 1276 example_1.0-1.dsc
+ 0d123be7f51e61c4bf15e5c492b484054be7e90f3081608a5517007bfb1fd128 171602 example_1.0.orig.tar.gz
+ f54ae966a5f580571ae7d9ef5e1df0bd42d63e27cb505b27957351a495bc6288 6137 example_1.0-1.debian.tar.gz
+ 3bec05c03974fdecd11d020fc2e8250de8404867a8a2ce865160c250eb723664 548402 example_1.0-1_i386.deb
+
+
+
+
+ In the .dsc file, these fields should list all
+ files that make up the source package. In
+ the .changes file, these fields should list all
+ files being uploaded. The list of files in these fields
+ must match the list of files in the Files field.
+
+
+
diff --git a/upgrading-checklist.sgml b/upgrading-checklist.sgml
index 4403115..ff36fcf 100644
--- a/upgrading-checklist.sgml
+++ b/upgrading-checklist.sgml
@@ -44,6 +44,11 @@ Release Jun 2010.
- The required format for the date in a changelog entry and in the
Date control field is now precisely specified.
+5.4, 5.5, 5.6.24
+ - Document and recommend the Checksums-Sha1
+ and Checksums-Sha256 fields in *.dsc
+ and *.changes files.
+
5.6.8, 7.1, 11.1.1
- Architecture wildcards may be used in addition to specific
architectures in debian/control and *.dsc