Minor editing, changelog, and upgrading-checklist for #569174

diff --git a/debian/changelog b/debian/changelog
index d71fccd6b38a4af6fe3d596542ef633395d8bc13..d0d039f18bed66c0b00beb486c98f4ab7d5107ff 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -45,6 +45,12 @@ debian-policy (3.8.5.0) UNRELEASED; urgency=low
     Seconded: Andrew McMillan <andrew@morphoss.com>
     Seconded: Steve Langasek <vorlon@debian.org>
     Closes: #224509
+  * Policy: Fully specify the date format for changelog entries
+    Wording: Charles Plessy <plessy@debian.org>
+    Seconded: Russ Allbery <rra@debian.org>
+    Seconded: Andrew McMillan <andrew@morphoss.com>
+    Seconded: Giacomo A. Catenazzi <cate@debian.org>
+    Closes: #569174
   * Perl Policy: Change perlapi provides to use an ABI version
     Wording: Niko Tyni <ntyni@debian.org>
     Seconded: Russ Allbery <rra@debian.org>

diff --git a/policy.sgml b/policy.sgml
index f0719b95c8beecb8a965ee6bbf05fd70e7e7f601..731d3f096958015d5e1ae428296beb3f95b303b2 100644 (file)
--- a/policy.sgml
+++ b/policy.sgml
@@ -1619,25 +1619,34 @@
 
        <p>
          The <var>date</var> has the following format<footnote>
-             This is generated by <tt>date -R</tt>.
+             This is the same as the format generated by <tt>date
+             -R</tt>.
          </footnote> (compatible and with the same semantics of
          RFC 2822 and RFC 5322):
          <example>day-of-week, dd month yyyy hh:mm:ss +zzzz</example>
-         where: 
+         where:
          <list compact="compact">
-           <item>day-of week is one of: Mon, Tue, Wed, Thu, Fri, Sat, Sun</item>
-           <item>dd is a one- or two-digit day of the month (01-31)</item>
-           <item>month is one of: Jan, Feb, Mar, Apr, May, Jun, Jul, Aug, Sep, Oct, Nov, Dec</item>
+           <item>
+             day-of week is one of: Mon, Tue, Wed, Thu, Fri, Sat, Sun
+           </item>
+           <item>
+             dd is a one- or two-digit day of the month (01-31)
+           </item>
+           <item>
+             month is one of: Jan, Feb, Mar, Apr, May, Jun, Jul, Aug,
+             Sep, Oct, Nov, Dec
+           </item>
            <item>yyyy is the four-digit year (e.g. 2010)</item>
-           <item>hh is the two-digit hour (00-23</item>
+           <item>hh is the two-digit hour (00-23)</item>
            <item>mm is the two-digit minutes (00-59)</item>
            <item>ss is the two-digit seconds (00-60)</item>
            <item>
-             +zzzz or -zzzz is the the time zone offset from Coordinated Universal
-             Time (UTC).  "+" indicates that the time is ahead of (i.e., east of) UTC
-             and "-" indicates that the time is behind (i.e., west of) UTC.  The
-             first two digits indicate the hour difference from UTC and the last
-             two digits indicate the number of additional minutes difference from
+             +zzzz or -zzzz is the the time zone offset from Coordinated
+             Universal Time (UTC).  "+" indicates that the time is ahead
+             of (i.e., east of) UTC and "-" indicates that the time is
+             behind (i.e., west of) UTC.  The first two digits indicate
+             the hour difference from UTC and the last two digits
+             indicate the number of additional minutes difference from
              UTC.  The last two digits must be in the range 00-59.
            </item>
          </list>
@@ -3218,7 +3227,9 @@ Package: libc6
          <heading><tt>Date</tt></heading>
 
          <p>
-           This field includes the date the package was built or last edited.
+           This field includes the date the package was built or last
+           edited.  It must be in the same format as the <var>date</var>
+           in a <file>debian/changelog</file> entry.
          </p>
 
          <p>

diff --git a/upgrading-checklist.sgml b/upgrading-checklist.sgml
index f58d9e6ed23ea06ba9b0552718a160022a6137ce..03669f9a6be3598760cddc18636710a07c38a930 100644 (file)
--- a/upgrading-checklist.sgml
+++ b/upgrading-checklist.sgml
@@ -40,6 +40,10 @@ picking your way through this list.
 Release Jun 2010.
 
 </p><p><taglist>
+<tag>4.4, 5.6.15</tag>
+  <item>The required format for the date in a changelog entry and in the
+  Date control field is now precisely specified.
+  </item>
 <tag>5.6.8, 7.1, 11.1.1</tag>
   <item>Architecture wildcards may be used in addition to specific
   architectures in <file>debian/control</file> and <file>*.dsc</file>