[oe-commits] Martin Jansa : Xorg: Xserver test is only for -mouse arg, USB_MOUSE is for both

[git version control]

Module: openembedded.git
Branch: shr/import
Commit: b833462d99c1b5a3bb8798a064d9746d3117ee04
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=b833462d99c1b5a3bb8798a064d9746d3117ee04

Author: Martin Jansa <martin.jansa at gmail.com>
Date:   Fri Sep 25 15:21:16 2009 +0000

Xorg: Xserver test is only for -mouse arg, USB_MOUSE is for both

Signed-off-by: Klaus Kurzmann <mok at fluxnetz.de>

---

 .../xserver-kdrive-common/shr/Xserver              |    6 ++++--
 .../xserver-kdrive-common_0.1.bb                   |    2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/recipes/xserver-kdrive-common/xserver-kdrive-common/shr/Xserver b/recipes/xserver-kdrive-common/xserver-kdrive-common/shr/Xserver
index 03e2cde..5358cd8 100644
--- a/recipes/xserver-kdrive-common/xserver-kdrive-common/shr/Xserver
+++ b/recipes/xserver-kdrive-common/xserver-kdrive-common/shr/Xserver
@@ -56,8 +56,10 @@ fi
 # use usb mouse if present
 # Xorg doesn't support "-mouse" option, and uses /dev/input/mouse0 automatically
 # On neo we have touchscreen as /dev/input/mice, usb connected mouse would be probably mouse0
-if [ -z "$TSLIB_TSDEVICE" ] && [ -e /dev/input/mouse0 ] && [ "$XSERVER" != "/usr/bin/Xorg" ]; then
-  ARGS="$ARGS -mouse /dev/input/mouse0"
+if [ -z "$TSLIB_TSDEVICE" ] && [ -e /dev/input/mouse0 ]; then
+  if [ "$XSERVER" != "/usr/bin/Xorg" ]; then
+    ARGS="$ARGS -mouse /dev/input/mouse0"
+  fi
   USB_MOUSE="1"
 fi
 
diff --git a/recipes/xserver-kdrive-common/xserver-kdrive-common_0.1.bb b/recipes/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
index d570666..7e4f037 100644
--- a/recipes/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
+++ b/recipes/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Common X11 scripts"
 LICENSE = "GPL"
 SECTION = "x11"
-PR = "r40"
+PR = "r41"
 
 SRC_URI = "\
   file://Xdefaults \