Merge branch 'master' into bug224509-rra

diff --git a/debian/changelog b/debian/changelog
index 372f1914fb2dd2fa5559c4401d53d9941446630e..a9d54e6ab995e313dbd4405998436c3965faa0f0 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-debian-policy (3.8.3.0) UNRELEASED; urgency=low
+debian-policy (3.8.3.0) unstable; urgency=low
 
   * Policy: Bring Architecture description in line with dpkg-source
     Wording: Russ Allbery <rra@debian.org>
@@ -19,7 +19,6 @@ debian-policy (3.8.3.0) UNRELEASED; urgency=low
     Wording: Steve Langasek <vorlon@debian.org>
     Seconded: Russ Allbery <rra@debian.org>
     Seconded: Kurt Roeckx <kurt@roeckx.be>
-    Seconded: Goswin von Brederlow <goswin-v-b@web.de>
     Seconded: Adeodato Simó <dato@net.com.org.es>
     Seconded: Julien Cristau <jcristau@debian.org>
     Closes: #519941
@@ -31,8 +30,8 @@ debian-policy (3.8.3.0) UNRELEASED; urgency=low
     Closes: #522217
   * Policy: Localized man pages should be up-to-date or warn
     Wording: Russ Allbery <rra@debian.org>
-    Seconded: Helge Kreutzmann <debian@helgefjell.de>
     Seconded: Julien Cristau <jcristau@debian.org>
+    Seconded: Raphaël Hertzog <hertzog@debian.org>
     Closes: #493007
   * Policy: Remove restriction on manual page character encoding
     Wording: Colin Watson <cjwatson@debian.org>
@@ -72,8 +71,13 @@ debian-policy (3.8.3.0) UNRELEASED; urgency=low
     a *.changes file.
   * Merge the package name syntax requirements between the Package and
     Source field descriptions.
+  * Say that sensible-editor and sensible-pager are provided by the
+    sensible-utils package, not by the base system.  Thanks, Clint Adams
+    and Steve Langasek.  (Closes: #541537)
+  * Document that control field values are case-sensitive unless the field
+    description says otherwise.
 
- -- Russ Allbery <rra@debian.org>  Thu, 18 Jun 2009 15:59:48 -0700
+ -- Russ Allbery <rra@debian.org>  Sat, 15 Aug 2009 17:13:26 -0700
 
 debian-policy (3.8.2.0) unstable; urgency=low
 

diff --git a/debian/control b/debian/control
index 1c75184bf240fa391765d1a18f657a37532c7d7a..7f3c69c45cfeba15c7b43a07b76c827dc454f8ea 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: doc
 Priority: optional
 Maintainer: Debian Policy List <debian-policy@lists.debian.org>
 Uploaders: Manoj Srivastava <srivasta@debian.org>, Russ Allbery <rra@debian.org>, Colin Watson <cjwatson@debian.org>, Bill Allombert <ballombe@debian.org>
-Standards-Version: 3.8.1
+Standards-Version: 3.8.3
 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/policy.sgml b/policy.sgml
index bc6bc529c0f5b11a58a52033e5035279a40e7ac8..0e1685ca15fcd55441763b36418d4dbb3f72cde2 100644 (file)
--- a/policy.sgml
+++ b/policy.sgml
@@ -2379,6 +2379,8 @@ Package: libc6
        <p>
          Field names are not case-sensitive, but it is usual to
          capitalize the field names using mixed case as shown below.
+         Field values are case-sensitive unless the description of the
+         field says otherwise.
        </p>
 
        <p>
@@ -7956,10 +7958,10 @@ done
          use <file>/usr/bin/sensible-editor</file> and
          <file>/usr/bin/sensible-pager</file> as the editor or pager
          program respectively.  These are two scripts provided in the
-         Debian base system that check the EDITOR and PAGER variables
-         and launch the appropriate program, and fall back to
-         <file>/usr/bin/editor</file> and <file>/usr/bin/pager</file> if the
-         variable is not set.
+         <package>sensible-utils</package> package that check the EDITOR
+         and PAGER variables and launch the appropriate program, and fall
+         back to <file>/usr/bin/editor</file>
+         and <file>/usr/bin/pager</file> if the variable is not set.
        </p>
 
        <p>
@@ -8869,7 +8871,11 @@ name ["<var>syshostname</var>"]:
            scripts.  This is no longer necessary.  The installation
            system now uses dpkg triggers.
          </footnote>
-         This file must not be included in packages.
+         This file must not be included in packages.  Packages containing
+         info documents should depend on <tt>dpkg (>= 1.15.4) |
+         install-info</tt> to ensure that the directory file is properly
+         rebuilt during partial upgrades from Debian 5.0 (lenny) and
+         earlier.
        </p>
 
        <p>

diff --git a/upgrading-checklist.html b/upgrading-checklist.html
index f657e279fd9421b06749990a453e8d968388ed6d..11e81c4f6745b0bc3535d914d05efa058ba14c91 100644 (file)
--- a/upgrading-checklist.html
+++ b/upgrading-checklist.html
@@ -41,7 +41,7 @@ picking your way through this list.
 <h2>The checklist</h2>
 
 <pre>
-3.8.3.0                        unreleased
+3.8.3.0                        Aug 2009
 
      * Add DEB_*_ARCH_CPU and DEB_*_ARCH_OS variables and recommend them
        over GNU-style variables for that information.            [4.9]
@@ -66,7 +66,9 @@ picking your way through this list.
        original language.                                        [12.1]
      * install-info is now handled via triggers so packages no longer need
        to invoke it in maintainer scripts.  Info documents should now have
-       directory sections and entries in the document.           [12.2]
+       directory sections and entries in the document.  Packages
+       containing info documents should add a dependency to support
+       partial upgrades.                                         [12.2]
      * The requirement for Perl modules to have a versioned Depend and
        Build-Depend on perl >= 5.6.0-16 has been removed.        [perl]