Merge lists of urgency values and include a complete list

Remove the footnote in the changelog description that provides one
incomplete list of urgency values.  Add a normative list instead of
examples in the description of the Urgency field, and move the rest
of the footnote content about dak behavior to there.

git-archimport-id: rra@debian.org--lenny/debian-policy--devel--3.7--patch-14

diff --git a/debian/changelog b/debian/changelog
index 241c4c9a4da7423905986f8a361d7cf619178182..c0e88af8e0d72f12c5f122226bcdffce94d370f6 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,7 +24,9 @@ debian-policy (3.7.3.0) UNRELEASED; urgency=low
   * Bug fix: "Source field of .changes files may contain a version number"
                                                              (Closes: #431813).
   * Bug fix: "822-date is deprecated (use date -R instead)"  (Closes: #448035).
-
+  * Bug fix: "5.6.17 (Urgency) should list emergency, maybe a normative
+    list?"                                                   (Closes: #412634).
+  
  --
 
 debian-policy (3.7.2.2) unstable; urgency=low

diff --git a/policy.sgml b/policy.sgml
index c6f273a94971db43f6c4eda7e99d8391571735f7..5412107098c982e42af77335b6151a5ec2deade0 100644 (file)
--- a/policy.sgml
+++ b/policy.sgml
@@ -1516,14 +1516,7 @@
          <tt><var>keyword</var>=<var>value</var></tt> settings in the
          <prgn>dpkg</prgn> changelog format (though there is
          currently only one useful <var>keyword</var>,
-         <tt>urgency</tt>).<footnote>
-             Recognized urgency values are <tt>low</tt>,
-             <tt>medium</tt>, <tt>high</tt> and <tt>emergency</tt>.
-             They have an effect on how quickly a package will be
-             considered for inclusion into the <tt>testing</tt>
-             distribution, and give an indication of the importance
-             of any fixes included in this upload.
-         </footnote>
+         <tt>urgency</tt>).
        </p>
 
        <p>
@@ -2949,10 +2942,19 @@ Package: libc6
          <p>
            This is a description of how important it is to upgrade to
            this version from previous ones.  It consists of a single
-           keyword usually taking one of the values <tt>low</tt>,
-           <tt>medium</tt> or <tt>high</tt> (not case-sensitive)
-           followed by an optional commentary (separated by a space)
-           which is usually in parentheses.  For example:
+           keyword taking one of the values <tt>low</tt>,
+           <tt>medium</tt>, <tt>high</tt>, <tt>emergency</tt>, or
+           <tt>critical</tt><footnote>
+             Other urgency values are supported with configuration
+             changes in the archive software but are not used in Debian.
+             The urgency affects how quickly a package will be considered
+             for inclusion into the <tt>testing</tt> distribution and
+             gives an indication of the importance of any fixes included
+             in the upload.  <tt>Emergency</tt> and <tt>critical</tt> are
+             treated as synonymous.
+           </footnote> (not case-sensitive) followed by an optional
+           commentary (separated by a space) which is usually in
+           parentheses.  For example:
 
            <example>
   Urgency: low (HIGH for users of diversions)

diff --git a/upgrading-checklist.html b/upgrading-checklist.html
index d3607c0dcbbe9e95b9b86a4879d66bceae2a8175..4fec7388bbfda722dba242002dc20d9204452013 100644 (file)
--- a/upgrading-checklist.html
+++ b/upgrading-checklist.html
@@ -68,6 +68,8 @@ picking your way through this list.
        sections would be more appropriate.                       [menu policy]
      * The Source field in a .changes file may contain a version number
        in parentheses.                                           [5.6.1]
+     * The acceptable values for the Urgency field are low, medium, high,
+       critical, or emergency.                                   [5.6.17]
 3.7.2.2                        Oct 2006
      * Maintainer scripts must not be world writeable (up from a
        should to a must)                                         [6.1]