From 5962332fcadf1826314a972f3352e9a179f9f23a Mon Sep 17 00:00:00 2001 From: Russ Allbery Date: Sat, 26 Jun 2010 15:32:01 -0700 Subject: [PATCH] Further minor updates around the Format field description Be clear which control files consist of a single paragraph and use consistent terminology. Be more consistent about markup. Use an SGML entity for the .changes file version to avoid repeating it. --- policy.sgml | 48 ++++++++++++++++++++++++++---------------------- 1 file changed, 26 insertions(+), 22 deletions(-) diff --git a/policy.sgml b/policy.sgml index 77850d6..abb1a8e 100644 --- a/policy.sgml +++ b/policy.sgml @@ -2,6 +2,8 @@ %versiondata; + + ]> @@ -2497,7 +2499,7 @@ Package: libc6 These fields are used by dpkg-gencontrol to generate control files for binary packages (see below), by dpkg-genchanges to generate the - .changes file to accompany the upload, and by + .changes file to accompany the upload, and by dpkg-source when it creates the .dsc source control file as part of a source archive. Many fields are permitted to span multiple lines in @@ -2531,7 +2533,8 @@ Package: libc6

The DEBIAN/control file contains the most vital - (and version-dependent) information about a binary package. + (and version-dependent) information about a binary package. It + consists of a single paragraph.

@@ -2558,10 +2561,9 @@ Package: libc6 Debian source control files -- .dsc

- This file contains a series of fields, identified and - separated just like the fields in the control file of - a binary package. The fields are listed below; their - syntax is described above, in . + This file consists of a single paragraph, possibly surrounded by + a PGP signature. The fields of that paragraph are listed below. + Their syntax is described above, in . Format (mandatory) @@ -2597,16 +2599,17 @@ Package: libc6

The .changes files are used by the Debian archive maintenance software to process updates to packages. They - contain one paragraph which contains information from the - debian/control file and other data about the - source package gathered via debian/changelog - and debian/rules. + consist of a single paragraph, possibly surrounded by a PGP + signature. That paragraph contains information from the + debian/control file and other data about the + source package gathered via debian/changelog + and debian/rules.

.changes files have a format version that is incremented whenever the documented fields or their meaning - change. This document describes format 1.8. + change. This document describes format &changesversion;.

@@ -3270,20 +3273,21 @@ Package: libc6 The syntax of the field value is the same as that of a package version number except that no epoch or Debian revision is allowed. The format - described in this document is 1.8. + described in this document is &changesversion;.

- In Debian source - control files, this field declares the format of the - source package. The field value is used by programs acting on - a source package to interpret the list of files in the source - package and determine how to unpack it. The syntax of the - field value is a numeric major revision, a period, a numeric - minor revision, and then an optional subtype after whitespace, - which if specified is an alphanumeric word in parentheses. - The subtype is optional in the syntax but may be mandatory for - particular source format revisions. + In .dsc + Debian source control files, this field declares the + format of the source package. The field value is used by + programs acting on a source package to interpret the list of + files in the source package and determine how to unpack it. + The syntax of the field value is a numeric major revision, a + period, a numeric minor revision, and then an optional subtype + after whitespace, which if specified is an alphanumeric word + in parentheses. The subtype is optional in the syntax but may + be mandatory for particular source format revisions. + The source formats currently supported by the Debian archive software are 1.0, 3.0 (native), and 3.0 (quilt). -- 2.39.5