[Pkg-kbd-devel] Bug#386837: console-setup: "none" defaults for several questions seem bogus

[Colin Watson]

Package: console-setup
Version: 1.7
Severity: normal
Tags: patch

I don't think the "none" defaults for several debconf questions make a
lot of sense. Nothing in console-setup appears to have any kind of
special handling for "none", and it's more usual to default unset string
questions to just the empty string. The attached patch does this.

This patch also adds special handling for XKBOPTIONS being '' to avoid
triggering unsupported_layout=yes. If you refuse the other part of the
patch, then "'')" would need to be changed to "''|none)".

Thanks,

-- 
Colin Watson                                       [cjwatson at debian.org]
-------------- next part --------------
--- console-setup-1.7.orig/debian/config.proto	2006-07-22 21:05:55.000000000 +0100
+++ console-setup-1.7/debian/config.proto	2006-09-10 12:05:27.000000000 +0100
@@ -1004,6 +1004,8 @@
     default_compose='No compose key'
     for option in `echo $XKBOPTIONS | sed 's/,/ /g'`; do
 	case "$option" in
+	    '')
+		;;
 	    grp:caps_toggle)
 		default_toggle='Caps Lock';;
 	    grp:toggle)
--- console-setup-1.7.orig/debian/console-setup.templates	2006-07-22 21:05:56.000000000 +0100
+++ console-setup-1.7/debian/console-setup.templates	2006-09-07 08:56:34.000000000 +0100
@@ -168,25 +168,20 @@
 
 Template: console-setup/modelcode
 Type: string
-Default: none
 Description: for internal use
 
 Template: console-setup/layoutcode
 Type: string
-Default: none
 Description: for internal use
 
 Template: console-setup/variantcode
 Type: string
-Default: none
 Description: for internal use
 
 Template: console-setup/optionscode
 Type: string
-Default: none
 Description: for internal use
 
 Template: console-setup/fontsize
 Type: string
-Default: none
 Description: for internal use