=== modified file 'debian/config.proto' --- debian/config.proto 2007-11-27 10:17:34 +0000 +++ debian/config.proto 2008-01-09 01:49:44 +0000 @@ -273,14 +273,16 @@ } decode_codeset () { + pattern="^$(echo "$*" | sed 's/[^ #0-9;A-Za-z-]/\\&/g')\\*" echo "$codesets" | \ - grep -F "$**" | \ + grep "$pattern" | \ sed 's/.*[*]//' } encode_codeset () { + pattern="\\*$(echo "$*" | sed 's/[^ #0-9;A-Za-z-]/\\&/g')\$" echo "$codesets" | \ - grep -F "*$*" | \ + grep "$pattern" | \ sed 's/[*].*//' } @@ -703,6 +705,10 @@ fi default_codeset="`decode_codeset $default_codeset`" +if [ -z "$default_codeset" ]; then + default_codeset=Uni1 + codeset_priority=high +fi default_layout='' default_variant='' @@ -1186,6 +1192,10 @@ default_model="$XKBMODEL" default_codeset="`decode_codeset $CODESET`" + if [ -z "$default_codeset" ]; then + default_codeset=Uni1 + codeset_priority=high + fi case "$XKBLAYOUT" in lt,lt)