Bug#617499: console-setup-mini: XKBOPTIONS is ignored when XKBVARIANT is empty

[Baptiste Carvello <baptiste13z@free.fr>]

Package: console-setup-mini
Version: 1.68
Severity: normal

After upgrading to squeeze and installing keyboard-configuration and
console-setup-mini, I couldn't get my compose:rwin option to be
respected on the linux consoles. The compose key had no effect. However,
Ctrl + . worked normally.

I think I traced the problem down to the way ckbdcomp (in my case
ckbcomp-mini) is invoked by setupcon. It is invoked in this way:

ckbcomp $acm_option $rules_option -model "$XKBMODEL" "$XKBLAYOUT" "$XKBVARIANT" 
"$XKBOPTIONS"

instead of the recommended way:

ckbcomp $acm_option $rules_option -model "$XKBMODEL" -layout "$XKBLAYOUT" 
-variant "$XKBVARIANT" -option "$XKBOPTIONS"

While the 2 versions do the same thing when all variables are non-empty
strings, they behave differently in the common case where XKBVARIANT is
"". In that case, with the first version, the argument-reading loop
stops at the first empty string, so that the option argument is silently
ignored.

Using the second form of invocation solves my compose-key problem.

Cheers,
Baptiste

-- System Information:
Debian Release: 6.0
  APT prefers stable
  APT policy: (910, 'stable'), (900, 'stable'), (890, 'squeeze-updates'), (80, 
'unstable'), (40, 'experimental')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.32-5-amd64 (SMP w/2 CPU cores)
Locale: LANG=fr_FR.utf8, LC_CTYPE=fr_FR.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash

Versions of packages console-setup-mini depends on:
ii  debconf [debconf-2.0]         1.5.36.1   Debian configuration management sy
ii  keyboard-configuration        1.68       system-wide keyboard preferences

Versions of packages console-setup-mini recommends:
ii  console-tools            1:0.2.3dbs-69.1 Linux console and font utilities

Versions of packages console-setup-mini suggests
ii  lsb-base                3.2-23.2squeeze1 Linux Standard Base 3.2 init scrip

-- no debconf information