From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Tue, 23 Feb 2010 14:06:49 +0000 (+0100)
Subject: xserver-kdrive-common: SHR - don't force user to calibrate his screen after first... 
X-Git-Tag: Release-2010-05/1~491^2~115
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5c3846f9bbf1dbb4a9ee1d916107747c2f9dc909;p=openembedded.git

xserver-kdrive-common: SHR - don't force user to calibrate his screen after first boot, but restore calibration if available.

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---

diff --git a/recipes/xserver-kdrive-common/xserver-kdrive-common/shr/89xTs_Calibrate b/recipes/xserver-kdrive-common/xserver-kdrive-common/shr/89xTs_Calibrate
index 0abe3b427d..a39ece5e57 100644
--- a/recipes/xserver-kdrive-common/xserver-kdrive-common/shr/89xTs_Calibrate
+++ b/recipes/xserver-kdrive-common/xserver-kdrive-common/shr/89xTs_Calibrate
@@ -28,6 +28,7 @@ if [ -d $SYSFS_CALIBRATION_DIR ]; then
 fi
 
 if [ -e /usr/bin/xinput_calibrator_once.sh ] ; then
+  if [ -e /etc/pointercal.xinput ] ; then
     if [ -e /usr/bin/fsoraw ] ; then
       # because ts tap to unblank will be used as first calibration click and then store invalid calibration
       fsoraw -fr CPU,Display -- /usr/bin/xinput_calibrator_once.sh
@@ -35,4 +36,5 @@ if [ -e /usr/bin/xinput_calibrator_once.sh ] ; then
       /usr/bin/xinput_calibrator_once.sh
     fi
     exit
+  fi
 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 bf4bca8d69..255df7accd 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 = "r41"
+PR = "r42"
 
 SRC_URI = "\
   file://Xdefaults \