[SCM] Debian GNU Hurd packaging branch, master, updated. debian/20120605-2-100-ga97dded

[Samuel Thibault]

The following commit has been merged in the master branch:
commit fd493f07b98b79d6cc1e8e3657013bd9189ab155
Author: Samuel Thibault <address@hidden>
Date:   Tue Jul 10 01:50:12 2012 +0000

    hurd-console.default: Get keyboard layout from console-setup.

diff --git a/debian/changelog b/debian/changelog
index a9fdf6a..99b187a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ hurd (20120710-1) UNRELEASED; urgency=low
     - patches/libdde_config.patch: Remove, merged upstream.
     - patches/libdde_fixes.patch: Remove, merged upstream.
     - patches/ext2fs_large_stores.patch: Refresh.
+  * hurd-console.default: Get keyboard layout from console-setup.
 
  -- Samuel Thibault <address@hidden>  Tue, 10 Jul 2012 01:36:55 +0000
 
diff --git a/debian/hurd-console.default b/debian/hurd-console.default
index 3655eb7..db67f3f 100644
--- a/debian/hurd-console.default
+++ b/debian/hurd-console.default
@@ -11,18 +11,12 @@ DISPLAY='-d vga'
 # console-driver-xkb package.
 KBD='-d pc_kbd'
 
-# The alternative xkb keyboard driver, as provided by the 
-# console-driver-xkb package.  It uses X11 style keymaps and supports
-# different keymaps.  Possible options are:
-# --keymap: The keymap to use. By default en_US is used. Examples of
-# some other keymaps are: fr, us, de, dvorak.
-# --keymapfile: The file that hold the descriptions of the default
-# keymaps file. This file holds the description of all keymaps. This
-# path should be relative to the path set by `xkbdir'. By default
-# "keymap/xfree86" is used.
-# --xkbdir: The root directory of the xkb configuration, by default
-# this is /etc/X11/xkb.
-#KBD='-d xkb'
+# this is bogus for a lot of cases, but the best we can do for now.
+if [ -f /etc/default/keyboard ]
+then
+  . /etc/default/keyboard
+fi
+[ -z "$XKBLAYOUT" ] || KBD="$KBD --keymap $XKBLAYOUT"
 
 # The keyboard repeater.  Required for running X11.
 KBD_REPEAT='--repeat=kbd'

-- 
Debian GNU Hurd packaging