Merge branch 'master' into bug522217-rra

diff --git a/debian/changelog b/debian/changelog
index 839be4ee3533650bf7502d82b467feed394d2c1b..c0970a036fcb3f170a9ca0f3350d73d5899e69fa 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,10 +10,25 @@ debian-policy (3.8.3.0) UNRELEASED; urgency=low
     Seconded: Russ Allbery <rra@debian.org>
     Seconded: Andrew McMillan <andrew@morphoss.com>
     Closes: #527871
+  * Policy: Remove support for uploads to multiple distributions
+    Wording: Russ Allbery <rra@debian.org>
+    Seconded: Raphael Hertzog <hertzog@debian.org>
+    Seconded: Manoj Srivastava <srivasta@debian.org>
+    Closes: #514919
+  * Perl Policy: Remove obsolete dependency requirements
+    Wording: Cyril Brulebois <kibi@debian.org>
+    Seconded: Russ Allbery <rra@debian.org>
+    Seconded: Manoj Srivastava <srivasta@debian.org>
+    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 <rra@debian.org>  Thu, 18 Jun 2009 15:59:48 -0700
 

diff --git a/perl-policy.sgml b/perl-policy.sgml
index 1421b46892a622124e0803da2a1a57daf0455f58..1d26df7c40ab75eaa6cb2a1cf4e768c116aa7d0f 100644 (file)
--- a/perl-policy.sgml
+++ b/perl-policy.sgml
@@ -319,10 +319,6 @@ $(MAKE) install PREFIX=$(CURDIR)/debian/<tmp>/usr
            (nominally just tmp)</p>
          </footnote>
        </p>
-       <p>
-         A <tt>Build-Depends</tt> on <tt>perl (>= 5.6.0-16)</tt> is
-         required.
-       </p>
       </sect>
 
       <sect id="module_deps">
@@ -342,13 +338,6 @@ $(MAKE) install PREFIX=$(CURDIR)/debian/&lt;tmp&gt;/usr
            the minimum required version, or more simply the current
            version.
          </p>
-         <p>
-           In the absence of an explicit requirement,
-           architecture-independent modules must depend on a minimum
-           <package>perl</package> or <package>perl-base</package>
-           version of <tt>5.6.0-16</tt> due to the changes in
-           <tt>@INC</tt> introduced by that version.
-         </p>
        </sect1>
 
        <sect1 id="binary_modules">

diff --git a/policy.sgml b/policy.sgml
index f0e2c6e0f7a4e528a84fbd8688d79c99fed72fac..b27c9da5d95f5bd10a033705f1558344e347d994 100644 (file)
--- a/policy.sgml
+++ b/policy.sgml
@@ -24,6 +24,13 @@
          Copyright © 1996,1997,1998 Ian Jackson
          and Christian Schwarz.
        </copyrightsummary>
+       <p>
+         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.
+       </p>
+
        <p>
          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.<footnote>
-               Current distribution names are:
+             Example distribution names in the Debian archive used in
+             <file>.changes</file> files are:
                <taglist compact="compact">
-                 <tag><em>stable</em></tag>
-                 <item>
-                     This is the current "released" version of Debian
-                     GNU/Linux.  Once the distribution is
-                     <em>stable</em> 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).
-                 </item>
-
                  <tag><em>unstable</em></tag>
                  <item>
-                     This distribution value refers to the
-                     <em>developmental</em> part of the Debian
-                     distribution tree. New packages, new upstream
-                     versions of packages and bug fixes go into the
-                     <em>unstable</em> directory tree. Download from
-                     this distribution at your own risk.
-                 </item>
-
-                 <tag><em>testing</em></tag>
-                 <item>
-                     This distribution value refers to the
-                     <em>testing</em> 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
-                     <em>testing</em>.
-                 </item>
-
-                 <tag><em>frozen</em></tag>
-                 <item>
-                     From time to time, the <em>testing</em>
-                     distribution enters a state of "code-freeze" in
-                     anticipation of release as a <em>stable</em>
-                     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
+                   <em>developmental</em> part of the Debian distribution
+                   tree.  Most new packages, new upstream versions of
+                   packages and bug fixes go into the <em>unstable</em>
+                   directory tree.
                  </item>
 
                  <tag><em>experimental</em></tag>
                  <item>
-                     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.
                  </item>
                </taglist>
 
                <p>
-                 You should list <em>all</em> distributions that the
-                 package should be installed into.
-               </p>
-
-               <p>
-                 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".
                </p>
            </footnote>
+           The Debian archive software only supports listing a single
+           distribution.  Migration of packages to other distributions is
+           handled outside of the upload process.
          </p>
        </sect1>
 
@@ -3328,8 +3298,9 @@ Package: libc6
          </p>
 
          <p>
-           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.
          </p>
        </sect1>
 

diff --git a/upgrading-checklist.html b/upgrading-checklist.html
index b551201c033ddc97d695d28859a6eaf7243b34e0..970e97ef9465b446bccda8845618af91e81ac82c 100644 (file)
--- 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