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=ded825935f6f2cfe97d57903c29b173b86b891ee;p=debian%2Fdebian-policy.git Merge branch 'master' into bug104373-rra --- diff --git a/Makefile b/Makefile index 20433d7..5d8931a 100644 --- a/Makefile +++ b/Makefile @@ -3,6 +3,7 @@ include debian/rules policy.sgml: version.ent menu-policy.sgml: version.ent mime-policy.sgml: version.ent +perl-policy.sgml: version.ent ifneq (,$(strip $(HAVE_ORG_EMACS))) %.txt: %.org diff --git a/debian/changelog b/debian/changelog index 205a899..fedb536 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,23 @@ -debian-policy (3.9.0.0) UNRELEASED; urgency=low +debian-policy (3.9.1.0) UNRELEASED; urgency=low + + * Policy: Include GPL version 1 in common-licenses + Wording: Russ Allbery + Seconded: gregor herrmann + Seconded: Damyan Ivanov + Seconded: Giacomo A. Catenazzi + Closes: #436105 + * Set the version of the Perl Policy to match the version of the Policy + package. + * Explain the Perl module package naming policy more explicitly and + provide some examples. (Closes: #175202) + * Add Pre-Depends and Build-Depends-Indep to the relationships not + allowed from main to contrib or non-free and mention that such + relationships are okay if the non-free package is only an + alternative. Thanks, Raphael Geissert. (Closes: #587279) + + -- Russ Allbery Mon, 28 Jun 2010 09:34:54 -0700 + +debian-policy (3.9.0.0) unstable; urgency=low [ Colin Watson ] * Fix path to changelog.Debian.gz in footnote on documentation symlinks. @@ -83,6 +102,12 @@ debian-policy (3.9.0.0) UNRELEASED; urgency=low Seconded: Emilio Pozuelo Monfort Seconded: Andrew McMillan Closes: #575639 + * Policy: Update Format control field documentation + Wording: Russ Allbery + Wording: Charles Plessy + Seconded: Charles Plessy + Seconded: Emilio Pozuelo Monfort + Closes: #547272 * Debconf: Add SETTITLE, like title but uses a template Wording: Frans Pop Seconded: Russ Allbery @@ -132,8 +157,9 @@ debian-policy (3.9.0.0) UNRELEASED; urgency=low * Avoid "Debianised" or "Debianized" in favor of just "Debian" or "Debian package" as appropriate. Patch from Ben Finney. (Closes: #586163) + * Switch to source format 3.0 (native). - -- Bill Allombert Mon, 31 May 2010 20:00:28 +0200 + -- Russ Allbery Sun, 27 Jun 2010 21:40:52 -0700 debian-policy (3.8.4.0) unstable; urgency=low diff --git a/debian/control b/debian/control index 897ab26..673eb76 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: doc Priority: optional Maintainer: Debian Policy List Uploaders: Manoj Srivastava , Russ Allbery , Colin Watson , Bill Allombert -Standards-Version: 3.8.4 +Standards-Version: 3.9.0 Build-Depends-Indep: sgml-data (>= 2.0), debiandoc-sgml (>= 1.1.47), texlive, texlive-latex-extra, groff, bsdmainutils, pstoedit, jade, docbook-xml (>= 3.1.1), docbook-dsssl, tidy, links (>= 0.90) | elinks Vcs-Browser: http://git.debian.org/?p=dbnpolicy/policy.git Vcs-Git: git://git.debian.org/git/dbnpolicy/policy.git diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..89ae9db --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/perl-policy.sgml b/perl-policy.sgml index 4f34758..3b76b94 100644 --- a/perl-policy.sgml +++ b/perl-policy.sgml @@ -1,4 +1,8 @@ - + + %versiondata; +]> @@ -14,7 +18,7 @@ The Debian Policy mailing list debian-policy@lists.debian.org - version 1.20 + version &version;, &date; This document describes the packaging of Perl within the Debian @@ -294,10 +298,17 @@ make install Module Package Names

Perl module packages should be named for the primary module - provided. The naming convention for module Foo::Bar - is libfoo-bar-perl. Packages which include - multiple modules may additionally include provides for those - modules using the same convention. + provided. The naming convention is to lowercase the Perl module + name, prepend, lib, change all occurrences + of :: to -, and append -perl. For + example: + +Foo::Bar libfoo-bar-perl +Foo::Bar::Baz libfoo-bar-baz-perl +Foo::BarBaz libfoo-barbaz-perl + + Packages which include multiple modules may additionally include + provides for the additional modules using the same convention.

diff --git a/policy.sgml b/policy.sgml index 48e4295..57ac14c 100644 --- a/policy.sgml +++ b/policy.sgml @@ -2,6 +2,8 @@ %versiondata; + + ]> @@ -474,9 +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 @@ 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 +2535,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 +2563,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) @@ -2595,12 +2599,19 @@ Package: libc6 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 @@ Package: libc6 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 @@ Checksums-Sha256: must match the list of files in the Files field.

- @@ -9383,14 +9411,15 @@ END-INFO-DIR-ENTRY

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, diff --git a/upgrading-checklist.sgml b/upgrading-checklist.sgml index 06349a5..fabc1cb 100644 --- a/upgrading-checklist.sgml +++ b/upgrading-checklist.sgml @@ -34,10 +34,23 @@ picking your way through this list. The checklist - Version 3.8.5.0 + Version 3.9.1.0

-Release Jun 2010. +Not yet released. + +

+12.5 + The GPL version 1 is now included in common-licenses and should be + referenced from there instead of included in the copyright + file. + +

+ + Version 3.9.0.0 +

+ +Released June, 2010.

4.4, 5.6.15 @@ -53,6 +66,13 @@ Release Jun 2010. and Checksums-Sha256 fields in *.dsc and *.changes files. +5.5, 5.6.16 + The Format field of .changes files is now + 1.8. The Format field syntax for source + package .dsc files allows a subtype in parentheses, and it + is used for a different purpose than the Format field + for .changes files. + 5.6.2 The syntax of the Maintainer field is now must rather than should. @@ -85,7 +105,7 @@ Release Jun 2010. 7.5 Use Conflicts with Provides if only one provider - of a virtual facility can ge installed at a time. + of a virtual facility can be installed at a time. 8.4 All shared library development files are no longer required to be