debian/changelog | 4 +++-
debian/xserver-xorg.postinst.in | 12 +++++++++++-
2 files changed, 14 insertions(+), 2 deletions(-)
New commits:
commit a3981617ffc901f14facf829ba2e33828a675ccd
Author: Timo Aaltonen <[EMAIL PROTECTED]>
Date: Mon Oct 22 01:21:10 2007 +0300
Ubuntu: Detect keyboard layout configuration using
/etc/default/console-setup if available.
This needs support in d-i & console-setup.
diff --git a/debian/changelog b/debian/changelog
index b6df0b5..99b324e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -30,10 +30,12 @@ xorg (1:7.3+3) UNRELEASED; urgency=low
- Sparc doesn't need sun types keyboard since 2.6 kernel come to play
in the game. Make it use pc105 instead with xorg rules.
- Use fbset for HPPA.
+ - Detect keyboard layout configuration using /etc/default/console-setup
+ if available.
* dexconf: Fix problem preventing touchpad scrolling from being able to be
enabled by switching HorizEdgeDelta for HorizEdgeScroll.
- -- Timo Aaltonen <[EMAIL PROTECTED]> Sun, 21 Oct 2007 20:18:38 +0300
+ -- Timo Aaltonen <[EMAIL PROTECTED]> Mon, 22 Oct 2007 01:15:09 +0300
xorg (1:7.3+2) unstable; urgency=low
diff --git a/debian/xserver-xorg.postinst.in b/debian/xserver-xorg.postinst.in
index e7c89b7..51ca25c 100644
--- a/debian/xserver-xorg.postinst.in
+++ b/debian/xserver-xorg.postinst.in
@@ -1001,7 +1001,17 @@ if [ "$RET" = "true" ]; then
db_set xserver-xorg/autodetect_keyboard false
fi
-if [ -n "$DOKBDETECT" ]; then
+if [ -n "$DOKBDETECT" ] && [ -f /etc/default/console-setup ]; then
+ # Hmm. At least for now, none of the variables in this file will clash
+ # with our own variables ...
+ . /etc/default/console-setup
+fi
+
+if [ "$XKBLAYOUT" ]; then
+ debug_echo "Fetched keyboard layout from console configuration:"
+ debug_echo "layout: '$XKBLAYOUT', options: '$XKBOPTIONS', variant:
'$XKBVARIANT', model: '$XKBMODEL'"
+ PRIORITY=low
+elif [ -n "$DOKBDETECT" ]; then
# generated by a small bit of Perl from a static list of keymaps provided
# by Matthias Urlichs
[EMAIL PROTECTED]
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
