From: Marcin Juszkiewicz <hrw@openedhand.com>
Date: Thu, 24 Apr 2008 15:37:53 +0000 (+0000)
Subject: xserver-kdrive-common: do not load xmodmap - it breaks on 1.3.0.0
X-Git-Tag: 2011-1~9126
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=755df3ab5e279fd19c816b17195b07d8ed2973c4;p=openembedded-core.git

xserver-kdrive-common: do not load xmodmap - it breaks on 1.3.0.0


git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4330 311d38ba-8fff-0310-9ca6-ca027cbcb966
---

diff --git a/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/12keymap b/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/12keymap
index 7a22f43276..a9d102c746 100644
--- a/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/12keymap
+++ b/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/12keymap
@@ -1,4 +1,4 @@
 #!/bin/sh
 
-# since kdrive 1.4 there is no default keymap in server
-xmodmap - </etc/X11/default.xmodmap
+# kdrive 1.4 does not have default keymap in server
+#xmodmap - </etc/X11/default.xmodmap
diff --git a/meta/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb b/meta/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
index b7830dae91..2f7229bdcc 100644
--- a/meta/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
+++ b/meta/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Common X11 scripts"
 LICENSE = "GPL"
 SECTION = "x11"
 RDEPENDS_${PN} = "xmodmap libxrandr xdpyinfo xtscal xinit formfactor"
-PR = "r26"
+PR = "r27"
 
 SRC_URI = "file://etc"
 S = ${WORKDIR}