xorg-server: Changes to 'ubuntu'

[Timo Aaltonen <tjaalton-guest@alioth.debian.org>]

 debian/changelog               |    7 +++++++
 debian/local/64-xorg-xkb.rules |    2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 8aa9d4dc50214ab91089dfc2ca6c4139756d0676
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date:   Tue Dec 8 13:26:35 2009 +0200

    local/64-xorg-xkb.rules: Use "program" instead of "file" when grepping the XKB settings from console-setup.

diff --git a/debian/changelog b/debian/changelog
index 5facb67..58306ca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg-server (2:1.7.2-2ubuntu2) lucid; urgency=low
+
+  * local/64-xorg-xkb.rules: Use "program" instead of "file" when
+    grepping the XKB settings from console-setup.
+
+ -- Timo Aaltonen <tjaalton@ubuntu.com>  Tue, 08 Dec 2009 13:17:04 +0200
+
 xorg-server (2:1.7.2-2ubuntu1) lucid; urgency=low
 
   * Merge from Debian experimental. Remaining Ubuntu changes:
diff --git a/debian/local/64-xorg-xkb.rules b/debian/local/64-xorg-xkb.rules
index e543580..f5f2c8a 100644
--- a/debian/local/64-xorg-xkb.rules
+++ b/debian/local/64-xorg-xkb.rules
@@ -6,6 +6,6 @@ KERNEL!="event*", GOTO="xorg_xkb_end"
 ENV{ID_INPUT}=="", IMPORT{program}="/lib/udev/input_id %p"
 
 # import keyboard layout from /etc/default/keyboard
-ENV{ID_INPUT_KEY}=="?*", IMPORT{file}="/bin/grep ^XKB /etc/default/console-setup"
+ENV{ID_INPUT_KEY}=="?*", IMPORT{program}="/bin/grep ^XKB /etc/default/console-setup"
 
 LABEL="xorg_xkb_end"