Allow underscores in debconf template names

Underscores are already widely used in debconf template names, even though
not allowed by the specification, and both debconf and cdebconf permit
them.  Patch from Colin Watson.  (Bug#473761)

diff --git a/debconf_spec/debconf_specification.xml b/debconf_spec/debconf_specification.xml
index 1690f762cdfb6feb1c9cf716bba68f54762a5b56..ef8da7d7adfb7b342181126b5f7b847b8894babf 100644 (file)
--- a/debconf_spec/debconf_specification.xml
+++ b/debconf_spec/debconf_specification.xml
@@ -139,8 +139,8 @@
        So, what do we need to store in a variable template? Of course we
        need a name to identify the template. Template names are made up of
        components separated by the character `/' (slash).
-       Each component is limited to alphanumerics and `+' `-' `.'
-       (plus, minus, full stop).
+       Each component is limited to alphanumerics and `+' `-' `.' `_'
+       (plus, minus, full stop, underscore).
       </para>
       <para>
         A type is also needed so data can be verified. Here is a table

diff --git a/debian/changelog b/debian/changelog
index 4edb2614d59c0e233b60ee033af8c6cd7c2d5217..ba08482ecaef514e5e52fd500b3090e33bd2d5b7 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -30,6 +30,8 @@ debian-policy (3.7.4.0) unstable; urgency=low
                                                              (Closes: #65577).
   * Bug fix: "scripts as configuration files: should vs. must", thanks to Frank
     Küster                                                   (Closes: #403391).
+  * Bug fix: "debconf specification should allow underscores in template
+    names", thanks to Colin Watson                           (Closes: #473761).
   * Bug fix: "Examples of dpkg frontends should mention apt now", thanks
     to Josh Triplett                                         (Closes: #455602).
   * Bug fix: "Minor typos and wording suggestions", thanks to Michael

diff --git a/upgrading-checklist.html b/upgrading-checklist.html
index 2358c2f4aef577c42daf88ffed8bb510a09f37c4..7aa9dcbadca97e7f0e452e5ef850ec816c4a860a 100644 (file)
--- a/upgrading-checklist.html
+++ b/upgrading-checklist.html
@@ -99,6 +99,7 @@ picking your way through this list.
      * Packages in contrib and non-free should state in the copyright file
        that the package is not part of Debian GNU/Linux and briefly
        explain why.                                              [12.5]
+     * Underscore (_) is allowed in debconf template names.      [debconf]
 
 3.7.3.0                        Dec 2007