[oe-commits] Denis 'GNUtoo' Carikli : xserver-xorg-conf: htcdream: switch to htcdream version of the US keyboard

[git version control]

Module: openembedded.git
Branch: ulf/linux-2.6.30-2011-01-16
Commit: 4e704a48a73fae5f70e51ba11b27653598c15dd1
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=4e704a48a73fae5f70e51ba11b27653598c15dd1

Author: Denis 'GNUtoo' Carikli <GNUtoo at no-log.org>
Date:   Thu Jan 27 21:27:38 2011 +0100

xserver-xorg-conf: htcdream: switch to htcdream version of the US keyboard

The htcdream has an hardware keyboard with some key binded to
  alt+key,for instance alt+q should produce a Tab.

Before we didn't activate that feature, and instead we used
  the US keyboard default.

This feature depend on xkeyboard-config_git which is the default
  for most openembedded based distributions now.

This change only affect the htcdream's xorg.conf and PR was bumped.

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo at no-log.org>

---

 .../xserver-xorg-conf/htcdream/xorg.conf           |    3 ++-
 recipes/xorg-xserver/xserver-xorg-conf_0.1.bb      |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/recipes/xorg-xserver/xserver-xorg-conf/htcdream/xorg.conf b/recipes/xorg-xserver/xserver-xorg-conf/htcdream/xorg.conf
index 99d71dc..fc7d567 100644
--- a/recipes/xorg-xserver/xserver-xorg-conf/htcdream/xorg.conf
+++ b/recipes/xorg-xserver/xserver-xorg-conf/htcdream/xorg.conf
@@ -59,7 +59,8 @@ EndSection
 Section "InputDevice"
         Identifier  "Keyboard"
         Driver      "kbd"
-        Option      "XkbLayout" "en_US"
+        Option      "XkbLayout" "us"
+        Option      "XkbModel"  "htcdream"
 EndSection
 
 
diff --git a/recipes/xorg-xserver/xserver-xorg-conf_0.1.bb b/recipes/xorg-xserver/xserver-xorg-conf_0.1.bb
index 81cbe95..ec2135a 100644
--- a/recipes/xorg-xserver/xserver-xorg-conf_0.1.bb
+++ b/recipes/xorg-xserver/xserver-xorg-conf_0.1.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Machine specific xorg.conf files"
-PR = "r40"
+PR = "r41"
 
 SRC_URI = "file://xorg.conf"