xorg: Changes to 'ubuntu'
debian/changelog | 11 +++++++++++
debian/local/debian-x11-keymap.fdi | 16 ++++++++++++----
2 files changed, 23 insertions(+), 4 deletions(-)
New commits:
commit 1c0ef3e1164d634185ba7b8c69e86cb2a6960c73
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Wed Jul 1 00:21:55 2009 +0300
debian/local/debian-x11-keymap.fdi: Do not check for existing input.xkb.layout property;
This was only set by the previous 10-keymap.fdi, which got disabled together
with hal-setup-keymap. Directly check for input.keys capabilities, to make the
fdi independent. This restores proper X.org keyboard layout setting from
console-setup. (LP: #375618, again)
diff --git a/debian/changelog b/debian/changelog
index 09382dc..84caa8b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+xorg (1:7.4+3ubuntu4) karmic; urgency=low
+
+ * debian/local/debian-x11-keymap.fdi: Do not check for existing
+ input.xkb.layout property; this was only set by the previous
+ 10-keymap.fdi, which got disabled together with hal-setup-keymap.
+ Directly check for input.keys capabilities, to make the fdi
+ independent. This restores proper X.org keyboard layout setting
+ from console-setup. (LP: #375618, again)
+
+ -- Timo Aaltonen <tjaalton@ubuntu.com> Wed, 01 Jul 2009 00:19:16 +0300
+
xorg (1:7.4+3ubuntu3) karmic; urgency=low
* control: Change the gdm Breaks to match our version.
diff --git a/debian/local/debian-x11-keymap.fdi b/debian/local/debian-x11-keymap.fdi
index 38c04a7..daa48af 100644
--- a/debian/local/debian-x11-keymap.fdi
+++ b/debian/local/debian-x11-keymap.fdi
@@ -1,10 +1,18 @@
<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
<deviceinfo version="0.2">
<device>
- <match key="input.xkb.layout" exists="true">
- <append key="info.callouts.add" type="strlist">debian-setup-keyboard</append>
- </match>
- </device>
+ <match key="info.capabilities" contains="input.keys">
+ <merge key="input.xkb.rules" type="string">base</merge>
+ <merge key="input.xkb.model" type="string">evdev</merge>
+
+ <!-- Provide a default -->
+ <merge key="input.xkb.layout" type="string">us</merge>
+ <merge key="input.xkb.variant" type="string" />
+
+ <!-- Read console-setup values for real layout -->
+ <append key="info.callouts.add" type="strlist">debian-setup-keyboard</append>
+ </match>
+ </device>
</deviceinfo>
Reply to: