From: Denis 'GNUtoo' Carikli <GNUtoo@no-log.org>
Date: Thu, 27 Jan 2011 20:27:38 +0000 (+0100)
Subject: xserver-xorg-conf: htcdream: switch to htcdream version of the US keyboard
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9c66f0a21b1fcbc302dbac18bab6f473f9e06f4a;p=openembedded.git

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@no-log.org>
---

diff --git a/recipes/xorg-xserver/xserver-xorg-conf/htcdream/xorg.conf b/recipes/xorg-xserver/xserver-xorg-conf/htcdream/xorg.conf
index 99d71dc72d..fc7d567bca 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 81cbe95ff5..ec2135a2a1 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"