From: Russ Allbery Date: Tue, 29 Jun 2010 18:14:48 +0000 (-0700) Subject: Merge branch 'master' into bug104373-rra X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=96b4b014f126df57d6599ab9b0e5db4495f28bd0;hp=-c;p=debian%2Fdebian-policy.git Merge branch 'master' into bug104373-rra --- 96b4b014f126df57d6599ab9b0e5db4495f28bd0 diff --combined policy.sgml index 48e4295,9fe7158..57ac14c --- a/policy.sgml +++ b/policy.sgml @@@ -2,6 -2,8 +2,8 @@@ %versiondata; + + ]> @@@ -474,9 -476,11 +476,11 @@@ must not require a package outside of main for compilation or execution (thus, the package must - not declare a "Depends", "Recommends", or - "Build-Depends" relationship on a non-main - package), + not declare a Pre-Depends, Depends, + Recommends, Build-Depends, + or Build-Depends-Indep relationship on a + non-main package unless a package + in main is listed as an alternative), must not be so buggy that we refuse to support them, @@@ -2497,7 -2501,7 +2501,7 @@@ Package: libc 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 -2535,8 +2535,8 @@@

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 -2563,9 +2563,9 @@@ 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) @@@ -2595,12 -2599,19 +2599,19 @@@ Debian changes files -- .changes

- 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. + The .changes files are used by the Debian archive + maintenance software to process updates to packages. They + 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 &changesversion;.

@@@ -3259,12 -3270,30 +3270,30 @@@ Format

- This field specifies a format revision for the file. - The most current format described in the Policy Manual - is version 1.5. The syntax of the - format value is the same as that of a package version - number except that no epoch or Debian revision is allowed - - see . + In .changes + files, this field declares the format version of that file. + 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 &changesversion;. +

+ +

+ 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). +

@@@ -3525,7 -3554,6 +3554,6 @@@ Checksums-Sha256 must match the list of files in the Files field.

- @@@ -8328,13 -8356,11 +8356,13 @@@ don /usr/lib/cgi-bin/cgi-bin-name - and should be referred to as + or a subdirectory of that directory, and should be + referred to as http://localhost/cgi-bin/cgi-bin-name - + (possibly with a subdirectory name + before cgi-bin-name).
@@@ -9383,14 -9409,15 +9411,15 @@@ END-INFO-DIR-ENTR

Packages distributed under the Apache license (version 2.0), the - Artistic license, the GNU GPL (version 2 or 3), the GNU LGPL - (versions 2, 2.1, or 3), and the GNU FDL (versions 1.2 or 1.3) - should refer to the corresponding files + Artistic license, the GNU GPL (versions 1, 2, or 3), the GNU + LGPL (versions 2, 2.1, or 3), and the GNU FDL (versions 1.2 or + 1.3) should refer to the corresponding files under /usr/share/common-licenses,

In particular, /usr/share/common-licenses/Apache-2.0, /usr/share/common-licenses/Artistic, + /usr/share/common-licenses/GPL-1, /usr/share/common-licenses/GPL-2, /usr/share/common-licenses/GPL-3, /usr/share/common-licenses/LGPL-2,