11 files changed, 17 insertions, 11 deletions
diff --git a/packages/tslib/tslib-maemo/nokia770/tslib.sh b/packages/tslib/tslib-maemo/nokia770/tslib.sh
index d31bc76368..b7acc274c0 100644
--- a/packages/tslib/tslib-maemo/nokia770/tslib.sh
+++ b/packages/tslib/tslib-maemo/nokia770/tslib.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-TSLIB_TSDEVICE=`detect-stylus --device`
+TSLIB_TSDEVICE=/dev/input/touchscreen0
 
 export TSLIB_TSDEVICE
diff --git a/packages/tslib/tslib-maemo_0.0.1-15.bb b/packages/tslib/tslib-maemo_0.0.1-15.bb
index 483181a4f9..f744833d57 100644
--- a/packages/tslib/tslib-maemo_0.0.1-15.bb
+++ b/packages/tslib/tslib-maemo_0.0.1-15.bb
@@ -1,7 +1,7 @@
 DEFAULT_PREFERENCE = "-1"
 SECTION = "base"
 DESCRIPTION = "tslib is a touchscreen access library (maemo patched version)."
-PR = "r1"
+PR = "r2"
 PROVIDES = "tslib"
 
 DEFAULT_PREFERENCE = "-1"
diff --git a/packages/tslib/tslib/akita/tslib.sh b/packages/tslib/tslib/akita/tslib.sh
index 218da0751b..0c8b1a12b9 100644
--- a/packages/tslib/tslib/akita/tslib.sh
+++ b/packages/tslib/tslib/akita/tslib.sh
@@ -7,7 +7,7 @@ case `uname -r` in
 	TSLIB_CONFFILE=/usr/share/tslib/ts.conf-corgi-2.4
 	;;
 *)
-	TSLIB_TSDEVICE=/dev/input/event1
+	TSLIB_TSDEVICE=/dev/input/touchscreen0
 	TSLIB_TSEVENTTYPE=INPUT
 	TSLIB_CONFFILE=/usr/share/tslib/ts-2.6.conf
 	;;
diff --git a/packages/tslib/tslib/c7x0/tslib.sh b/packages/tslib/tslib/c7x0/tslib.sh
index 218da0751b..0c8b1a12b9 100644
--- a/packages/tslib/tslib/c7x0/tslib.sh
+++ b/packages/tslib/tslib/c7x0/tslib.sh
@@ -7,7 +7,7 @@ case `uname -r` in
 	TSLIB_CONFFILE=/usr/share/tslib/ts.conf-corgi-2.4
 	;;
 *)
-	TSLIB_TSDEVICE=/dev/input/event1
+	TSLIB_TSDEVICE=/dev/input/touchscreen0
 	TSLIB_TSEVENTTYPE=INPUT
 	TSLIB_CONFFILE=/usr/share/tslib/ts-2.6.conf
 	;;
diff --git a/packages/tslib/tslib/collie/tslib.sh b/packages/tslib/tslib/collie/tslib.sh
index d9cc02cb1c..759d5cf091 100644
--- a/packages/tslib/tslib/collie/tslib.sh
+++ b/packages/tslib/tslib/collie/tslib.sh
@@ -7,7 +7,7 @@ case `uname -r` in
 	TSLIB_CONFFILE=/usr/share/tslib/ts.conf-collie-2.4
 	;;
 *)
-	TSLIB_TSDEVICE=/dev/input/event1
+	TSLIB_TSDEVICE=/dev/input/touchscreen0
 	TSLIB_TSEVENTTYPE=INPUT
 	TSLIB_CONFFILE=/usr/share/tslib/ts-2.6.conf
 	;;
diff --git a/packages/tslib/tslib/ipaq-pxa270/tslib.sh b/packages/tslib/tslib/ipaq-pxa270/tslib.sh
index 3adaba0de8..3a6ba78c50 100644
--- a/packages/tslib/tslib/ipaq-pxa270/tslib.sh
+++ b/packages/tslib/tslib/ipaq-pxa270/tslib.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-TSLIB_TSDEVICE=`detect-stylus --device`
+TSLIB_TSDEVICE=/dev/input/touchscreen0
 TSLIB_CONFFILE=/usr/share/tslib/ts-2.6.conf
 
 export TSLIB_TSDEVICE TSLIB_CONFFILE
diff --git a/packages/tslib/tslib/poodle/tslib.sh b/packages/tslib/tslib/poodle/tslib.sh
index d9cc02cb1c..759d5cf091 100644
--- a/packages/tslib/tslib/poodle/tslib.sh
+++ b/packages/tslib/tslib/poodle/tslib.sh
@@ -7,7 +7,7 @@ case `uname -r` in
 	TSLIB_CONFFILE=/usr/share/tslib/ts.conf-collie-2.4
 	;;
 *)
-	TSLIB_TSDEVICE=/dev/input/event1
+	TSLIB_TSDEVICE=/dev/input/touchscreen0
 	TSLIB_TSEVENTTYPE=INPUT
 	TSLIB_CONFFILE=/usr/share/tslib/ts-2.6.conf
 	;;
diff --git a/packages/tslib/tslib/simpad/tslib.sh b/packages/tslib/tslib/simpad/tslib.sh
index 5301239373..39b1c4ba58 100644
--- a/packages/tslib/tslib/simpad/tslib.sh
+++ b/packages/tslib/tslib/simpad/tslib.sh
@@ -6,7 +6,7 @@ case `uname -r` in
 	TSLIB_CONFFILE=/usr/share/tslib/ts.conf-simpad-2.4
 	;;
 *)
-	TSLIB_TSDEVICE=/dev/input/event0
+	TSLIB_TSDEVICE=/dev/input/touchscreen0
 	TSLIB_CONFFILE=/usr/share/tslib/ts-2.6.conf
 	;;
 esac
diff --git a/packages/tslib/tslib/spitz/tslib.sh b/packages/tslib/tslib/spitz/tslib.sh
index 218da0751b..0c8b1a12b9 100644
--- a/packages/tslib/tslib/spitz/tslib.sh
+++ b/packages/tslib/tslib/spitz/tslib.sh
@@ -7,7 +7,7 @@ case `uname -r` in
 	TSLIB_CONFFILE=/usr/share/tslib/ts.conf-corgi-2.4
 	;;
 *)
-	TSLIB_TSDEVICE=/dev/input/event1
+	TSLIB_TSDEVICE=/dev/input/touchscreen0
 	TSLIB_TSEVENTTYPE=INPUT
 	TSLIB_CONFFILE=/usr/share/tslib/ts-2.6.conf
 	;;
diff --git a/packages/tslib/tslib/tosa/tslib.sh b/packages/tslib/tslib/tosa/tslib.sh
index 218da0751b..0c8b1a12b9 100644
--- a/packages/tslib/tslib/tosa/tslib.sh
+++ b/packages/tslib/tslib/tosa/tslib.sh
@@ -7,7 +7,7 @@ case `uname -r` in
 	TSLIB_CONFFILE=/usr/share/tslib/ts.conf-corgi-2.4
 	;;
 *)
-	TSLIB_TSDEVICE=/dev/input/event1
+	TSLIB_TSDEVICE=/dev/input/touchscreen0
 	TSLIB_TSEVENTTYPE=INPUT
 	TSLIB_CONFFILE=/usr/share/tslib/ts-2.6.conf
 	;;
diff --git a/packages/tslib/tslib_cvs.bb b/packages/tslib/tslib_cvs.bb
index 57eede769d..5567ea7064 100644
--- a/packages/tslib/tslib_cvs.bb
+++ b/packages/tslib/tslib_cvs.bb
@@ -5,7 +5,7 @@ SECTION = "base"
 LICENSE = "LGPL"
 
 PV = "0.0+cvs${SRCDATE}"
-PR = "r35"
+PR = "r37"
 
 SRC_URI = "cvs://cvs:@pubcvs.arm.linux.org.uk/mnt/src/cvsroot;module=tslib \
            file://usec_fix.patch;patch=1 \
@@ -74,6 +74,12 @@ do_install_append() {
 SRC_URI_OVERRIDES_PACKAGE_ARCH = "0"
 CONFFILES_${PN} = "${sysconfdir}/ts.conf"
 
+RDEPENDS_tslib-conf_h1940 = "detect-stylus"
+RDEPENDS_tslib-conf_h2200 = "detect-stylus"
+RDEPENDS_tslib-conf_h3600 = "detect-stylus"
+RDEPENDS_tslib-conf_h3900 = "detect-stylus"
+RDEPENDS_tslib-conf_h6300 = "detect-stylus"
+
 PACKAGE_ARCH_tslib-conf = "${MACHINE_ARCH}"
 PACKAGE_ARCH_mnci = "${MACHINE_ARCH}"