Bug#631935: console-setup: setupcon does not set fonts if kpd-compat is installed

[mtths@nurfuerspam.de]

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

When setupcon uses the the wrapper script setfont from kbd-compat, it uses
the parameter -C which is only supported by the original from kbd.
Because kbd-compat depends on console-tools, the patch changes the search
order: first look for consolechars (console-tools), then look for setfont
(kbd).

-- System Information:
Debian Release: wheezy/sid
  APT prefers unstable
  APT policy: (998, 'unstable'), (99, 'testing')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.39 (SMP w/2 CPU cores)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash

Versions of packages console-setup depends on:
ii  console-setup-linux           1.73       Linux specific part of console-set
ii  debconf                       1.5.40     Debian configuration management sy
ii  keyboard-configuration        1.73       system-wide keyboard preferences
ii  xkb-data                      2.1-2      X Keyboard Extension (XKB) configu

console-setup recommends no packages.

Versions of packages console-setup suggests:
ii  locales                       2.13-7     Embedded GNU C Library: National L
ii  lsb-base                      3.2-27     Linux Standard Base 3.2 init scrip

Versions of packages keyboard-configuration depends on:
ii  debconf                       1.5.40     Debian configuration management sy

Versions of packages console-setup-linux depends on:
ii  console-tools              1:0.2.3dbs-70 Linux console and font utilities
ii  kbd-compat [kbd]           1:0.2.3dbs-70 Wrappers around console-tools for 
ii  keyboard-configuration     1.73          system-wide keyboard preferences

console-setup-linux suggests no packages.

Versions of packages console-setup is related to:
ii  console-common             0.7.85        basic infrastructure for text cons
ii  console-data               2:1.10-9      keymaps, fonts, charset maps, fall
ii  console-tools              1:0.2.3dbs-70 Linux console and font utilities
ii  kbd-compat [kbd]           1:0.2.3dbs-70 Wrappers around console-tools for 

-- debconf information:
* console-setup/variant: Deutschland
* console-setup/codeset47: # Latin1 and Latin5 - western Europe and Turkic languages
  console-setup/unsupported_options: true
  console-setup/fontsize-text: 16
* console-setup/compose: No compose key
  keyboard-configuration/layout:
  keyboard-configuration/xkb-keymap: de
* keyboard-configuration/variant: Deutschland
  debian-installer/console-setup-udeb/title:
  debian-installer/console-setup-udeb/title:
  keyboard-configuration/unsupported_options: true
  console-setup/framebuffer_only:
  console-setup/other:
* console-setup/ctrl_alt_bksp: false
* keyboard-configuration/ctrl_alt_bksp: false
  console-setup/guess_font:
  keyboard-configuration/variantcode:
  console-setup/modelcode: microsoft
  console-setup/store_defaults_in_debconf_db: true
  console-setup/switch: No temporary switch
  keyboard-configuration/other:
  console-setup/unsupported_config_layout: true
  keyboard-configuration/optionscode:
  console-setup/use_system_font:
  console-setup/fontsize: 8x16
  console-setup/unsupported_layout: true
  keyboard-configuration/modelcode: pc105
  keyboard-configuration/unsupported_config_options: true
* console-setup/charmap: UTF-8
  console-setup/layoutcode: de
* console-setup/fontface47: Terminus
  keyboard-configuration/unsupported_config_layout: true
  keyboard-configuration/toggle: No toggling
  console-setup/fontsize-text47: 8x16
  console-setup/optionscode:
* keyboard-configuration/compose: No compose key
  console-setup/unsupported_config_options: true
  keyboard-configuration/switch: No temporary switch
* console-setup/charmap47: UTF-8
  console-setup/layout:
* keyboard-configuration/altgr: The default for the keyboard layout
  console-setup/variantcode:
  console-setup/codesetcode: Lat15
  keyboard-configuration/unsupported_layout: true
* keyboard-configuration/model: Generische PC-Tastatur mit 105 Tasten (Intl)
* console-setup/altgr: The default for the keyboard layout
  keyboard-configuration/layoutcode: de
* console-setup/model: Microsoft Natural
* console-setup/fontsize-fb: 16
* console-setup/fontsize-fb47: 8x16
  keyboard-configuration/store_defaults_in_debconf_db: true
* console-setup/codeset: # Latin1 and Latin5 - western Europe and Turkic languages
  console-setup/toggle: No toggling
* console-setup/fontface: Terminus

--- /bin/setupcon.dpkg-dist	2011-04-12 23:09:20.000000000 +0200
+++ /bin/setupcon	2011-06-28 12:33:22.899790814 +0200
@@ -446,12 +446,12 @@
 if [ "$do_font" ]; then
     case "$kernel" in
         linux)
-            if which setfont >/dev/null ; then
-                do_font=linuxkbd
-            elif which consolechars >/dev/null ; then
+            if which consolechars >/dev/null ; then
                 do_font=linuxct
+            elif which setfont >/dev/null ; then
+                do_font=linuxkbd
             else
-                echo "Neither setfont nor consolechars is accessible. No font will be configured." >&2
+                echo "Neither consolechars nor setfont is accessible. No font will be configured." >&2
                 do_font=''
             fi
             ;;