From: Koen Kooi <koen@openembedded.org>
Date: Fri, 26 Sep 2008 08:06:32 +0000 (+0000)
Subject: xkeyboard-config: merge from poky
X-Git-Tag: Release-2010-05/1~5939
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b3a5025c455067becc065fa17a4d73de74b5cd3f;p=openembedded.git

xkeyboard-config: merge from poky
---

diff --git a/packages/xkeyboard-config/xkeyboard-config_1.3.bb b/packages/xkeyboard-config/xkeyboard-config_1.3.bb
index f69e63c824..cb448be243 100644
--- a/packages/xkeyboard-config/xkeyboard-config_1.3.bb
+++ b/packages/xkeyboard-config/xkeyboard-config_1.3.bb
@@ -2,6 +2,7 @@ DESCRIPTION = "Common X11 Keyboard layouts"
 LICENSE = "MIT"
 DEPENDS = "intltool xkbcomp-native"
 RDEPENDS = "xkbcomp"
+PR = "r2"
 
 SRC_URI = "http://xlibs.freedesktop.org/xkbdesc/xkeyboard-config-${PV}.tar.bz2"
 
@@ -13,4 +14,7 @@ do_stage() {
 
 do_install_append () {
     install -d ${D}/usr/share/X11/xkb/compiled
+    cd ${D}${datadir}/X11/xkb/rules && ln -sf base xorg
 }
+
+FILES_${PN} += "${datadir}/X11/xkb"