From: Russ Allbery Date: Sat, 4 Jul 2009 22:26:54 +0000 (-0700) Subject: Merge branch 'master' into bug522217-rra X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=907905af29883401668ca56652c6b9e0a75f75fe;hp=3c56be3a35075274e68b7d54b3343a074a6f0452;p=debian%2Fdebian-policy.git Merge branch 'master' into bug522217-rra --- diff --git a/debian/changelog b/debian/changelog index 839be4e..c0970a0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,10 +10,25 @@ debian-policy (3.8.3.0) UNRELEASED; urgency=low Seconded: Russ Allbery Seconded: Andrew McMillan Closes: #527871 + * Policy: Remove support for uploads to multiple distributions + Wording: Russ Allbery + Seconded: Raphael Hertzog + Seconded: Manoj Srivastava + Closes: #514919 + * Perl Policy: Remove obsolete dependency requirements + Wording: Cyril Brulebois + Seconded: Russ Allbery + Seconded: Manoj Srivastava + Closes: #525190 * Breaks is now supported by the stable release of dpkg, so drop warnings against its use. Thanks, Steve Langasek. (Closes: #533577) * Add references to the sections on Breaks and Conflicts to the section on binary dependencies. Thanks, Frank Küster. (Closes: #529771) + * Clarify that Installed-Size is in kibibytes. Thanks, Martin Dorey. + (Closes: #534408) + * Explain that the copyright dates are for the original Policy manual + and that there is no updated list of copyright holders for subsequent + revisions available. (Partly addresses #47438) -- Russ Allbery Thu, 18 Jun 2009 15:59:48 -0700 diff --git a/perl-policy.sgml b/perl-policy.sgml index 1421b46..1d26df7 100644 --- a/perl-policy.sgml +++ b/perl-policy.sgml @@ -319,10 +319,6 @@ $(MAKE) install PREFIX=$(CURDIR)/debian/<tmp>/usr (nominally just tmp)

-

- A Build-Depends on perl (>= 5.6.0-16) is - required. -

@@ -342,13 +338,6 @@ $(MAKE) install PREFIX=$(CURDIR)/debian/<tmp>/usr the minimum required version, or more simply the current version.

-

- In the absence of an explicit requirement, - architecture-independent modules must depend on a minimum - perl or perl-base - version of 5.6.0-16 due to the changes in - @INC introduced by that version. -

diff --git a/policy.sgml b/policy.sgml index f0e2c6e..b27c9da 100644 --- a/policy.sgml +++ b/policy.sgml @@ -24,6 +24,13 @@ Copyright © 1996,1997,1998 Ian Jackson and Christian Schwarz. +

+ These are the copyright dates of the original Policy manual. + Since then, this manual has been updated by many others. No + comprehensive collection of copyright notices for subsequent + work exists. +

+

This manual is free software; you may redistribute it and/or modify it under the terms of the GNU General Public License @@ -3118,76 +3125,39 @@ Package: libc6 distribution(s) where this version of the package should be installed. Valid distributions are determined by the archive maintainers. - Current distribution names are: + Example distribution names in the Debian archive used in + .changes files are: - stable - - This is the current "released" version of Debian - GNU/Linux. Once the distribution is - stable only security fixes and other - major bug fixes are allowed. When changes are - made to this distribution, the release number is - increased (for example: 2.2r1 becomes 2.2r2 then - 2.2r3, etc). - - unstable - This distribution value refers to the - developmental part of the Debian - distribution tree. New packages, new upstream - versions of packages and bug fixes go into the - unstable directory tree. Download from - this distribution at your own risk. - - - testing - - This distribution value refers to the - testing part of the Debian distribution - tree. It receives its packages from the - unstable distribution after a short time lag to - ensure that there are no major issues with the - unstable packages. It is less prone to breakage - than unstable, but still risky. It is not - possible to upload packages directly to - testing. - - - frozen - - From time to time, the testing - distribution enters a state of "code-freeze" in - anticipation of release as a stable - version. During this period of testing only - fixes for existing or newly-discovered bugs will - be allowed. The exact details of this stage are - determined by the Release Manager. + This distribution value refers to the + developmental part of the Debian distribution + tree. Most new packages, new upstream versions of + packages and bug fixes go into the unstable + directory tree. experimental - The packages with this distribution value are - deemed by their maintainers to be high - risk. Oftentimes they represent early beta or - developmental packages from various sources that - the maintainers want people to try, but are not - ready to be a part of the other parts of the - Debian distribution tree. Download at your own - risk. + The packages with this distribution value are deemed + by their maintainers to be high risk. Oftentimes they + represent early beta or developmental packages from + various sources that the maintainers want people to + try, but are not ready to be a part of the other parts + of the Debian distribution tree.

- You should list all distributions that the - package should be installed into. -

- -

- More information is available in the Debian Developer's - Reference, section "The Debian archive". + Others are used for updating stable releases or for + security uploads. More information is available in the + Debian Developer's Reference, section "The Debian + archive".

+ The Debian archive software only supports listing a single + distribution. Migration of packages to other distributions is + handled outside of the upload process.

@@ -3328,8 +3298,9 @@ Package: libc6

- The disk space is represented in kilobytes as a simple - decimal number. + The disk space is given as the integer value of the installed + size divided by 1024 (in other words, the size in kibibytes) + and rounded up.

diff --git a/upgrading-checklist.html b/upgrading-checklist.html index b551201..970e97e 100644 --- a/upgrading-checklist.html +++ b/upgrading-checklist.html @@ -48,6 +48,10 @@ picking your way through this list. * Source package Architecture fields may contain "all" in combination with other architectures. Clarify when "all" and "any" may be used in different versions of the field. [5.6.8] + * The Debian archive software does not support uploading to multiple + distributions with one *.changes file. [5.6.14] + * The requirement for Perl modules to have a versioned Depend and + Build-Depend on perl >= 5.6.0-16 has been removed. [perl] 3.8.2.0 Jun 2009