tslib|opie-taskbar: remove opie mouse hack for htcuniversal in tslib.sh and add it to where it belongs

(at least for now, with better ODevice support both mouse and keyboard settings in should be detected automatically)

6 files changed, 86 insertions, 7 deletions

diff --git a/packages/opie-taskbar/opie-taskbar/htcuniversal/.mtn2git_empty b/packages/opie-taskbar/opie-taskbar/htcuniversal/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/opie-taskbar/opie-taskbar/htcuniversal/.mtn2git_empty
diff --git a/packages/opie-taskbar/opie-taskbar/htcuniversal/opie b/packages/opie-taskbar/opie-taskbar/htcuniversal/opie
new file mode 100644
index 0000000000..fc39fff358
--- /dev/null
+++ b/packages/opie-taskbar/opie-taskbar/htcuniversal/opie
@@ -0,0 +1,82 @@
+#!/bin/sh
+#
+[ -z $LOGNAME ] && export LOGNAME=root && export HOME=/home/root
+[ -z $HOME ] && export HOME=/home/$LOGNAME
+
+export QTDIR=/opt/QtPalmtop
+export OPIEDIR=/opt/QtPalmtop
+export QPEDIR=/opt/QtPalmtop
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$OPIEDIR/lib
+export PATH=$PATH:$OPIEDIR/bin
+export QWS_MOUSE_PROTO=TPanel:`detect-stylus --device`
+export QWS_KEYBOARD=USB:/dev/input/event1
+
+if [ ! -x "$OPIEDIR/bin/qpe" ] ; then 
+    echo Opie not installed
+    exit 0 
+fi
+
+. /etc/profile
+
+for conf in $OPIEDIR/etc/skel/*.conf; do
+	conf_basename=`basename $conf`
+	if [ ! -e "$HOME/Settings/$conf_basename" ] ; then
+		echo "Copying default $conf_basename into $HOME/Settings/"
+		mkdir -p $HOME/Settings/
+		cat $conf >$HOME/Settings/$conf_basename
+	fi
+done
+
+if [ ! -e "$HOME/systeminfo/linkver" ] ; then
+    mkdir -p $HOME/systeminfo/
+    echo "1.13" >$HOME/systeminfo/linkver
+fi
+
+if [ ! -e "/opt/Qtopia" ] ; then
+    ln -sf /opt/QtPalmtop /opt/Qtopia
+fi
+
+case $1 in
+'start')
+    /sbin/getkey 5 "Starting Opie in 5 seconds... press key to interrupt." && exit 0
+    
+    if [ -x "$OPIEDIR/bin/opie-login" ]; then
+            echo Starting Opie-login....
+            $OPIEDIR/bin/opie-login -terminal 2
+    else
+        $OPIEDIR/bin/opie-reorgfiles
+        if [ -x /usr/bin/ssh-agent ]; then
+             SSHAGENT=/usr/bin/ssh-agent
+        else
+             SSHAGENT=""
+        fi
+        
+        if [ -x "$OPIEDIR/bin/opie-sh-ssh-askpass.sh" ]; then
+            export SSH_ASKPASS=$OPIEDIR/bin/opie-sh-ssh-askpass.sh
+        fi           
+        echo Starting Opie....
+        $SSHAGENT $OPIEDIR/bin/qpe -terminal 2
+    fi
+
+    ;;
+
+'stop')
+    echo "Stopping Opie..."
+    killall qpe 2>/dev/null
+    killall opie-login 2>/dev/null
+    killall quicklauncher 2>/dev/null
+
+    ;;
+
+'restart')
+	$0 stop && $0 start
+
+	;;
+
+*)
+    echo "usage: $0 { start | stop | restart }"
+
+    ;;
+
+esac
+
diff --git a/packages/opie-taskbar/opie-taskbar_1.2.1.bb b/packages/opie-taskbar/opie-taskbar_1.2.1.bb
index 1c6f764867..359ea213ec 100644
--- a/packages/opie-taskbar/opie-taskbar_1.2.1.bb
+++ b/packages/opie-taskbar/opie-taskbar_1.2.1.bb
@@ -1,5 +1,5 @@
 include ${PN}.inc
-PR = "r2" 
+PR = "r3"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/calibrate \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/mediummount \
diff --git a/packages/opie-taskbar/opie-taskbar_cvs.bb b/packages/opie-taskbar/opie-taskbar_cvs.bb
index 1fe08a8c1b..f1874cf82a 100644
--- a/packages/opie-taskbar/opie-taskbar_cvs.bb
+++ b/packages/opie-taskbar/opie-taskbar_cvs.bb
@@ -1,6 +1,6 @@
 include ${PN}.inc
 PV = "${OPIE_CVS_PV}"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/calibrate \
            ${HANDHELDS_CVS};module=opie/noncore/settings/mediummount \
diff --git a/packages/tslib/tslib/htcuniversal/tslib.sh b/packages/tslib/tslib/htcuniversal/tslib.sh
index 39f3ebab10..c19d3491cb 100644
--- a/packages/tslib/tslib/htcuniversal/tslib.sh
+++ b/packages/tslib/tslib/htcuniversal/tslib.sh
@@ -3,6 +3,3 @@
 TSLIB_TSDEVICE=`detect-stylus --device`
 TSLIB_CONFFILE=/etc/ts.conf
 
-# this one is for making opie happy...
-QWS_MOUSE_PROTO=TPanel:`detect-stylus --device`
-export TSLIB_TSDEVICE TSLIB_CONFFILE QWS_MOUSE_PROTO
diff --git a/packages/tslib/tslib_cvs.bb b/packages/tslib/tslib_cvs.bb
index c96ceab50b..bd3478191e 100644
--- a/packages/tslib/tslib_cvs.bb
+++ b/packages/tslib/tslib_cvs.bb
@@ -1,11 +1,11 @@
 DESCRIPTION = "tslib is a plugin-based flexible touchscreen access library."
 HOMEPAGE = "http://cvs.arm.linux.org.uk/"
-AUTHOR = "Russel King. Plugins by Chris Larson et. al."
+AUTHOR = "Russell King w/ plugins by Chris Larson et. al."
 SECTION = "base"
 LICENSE = "LGPL"
 
 PV = "0.0+cvs${SRCDATE}"
-PR = "r38"
+PR = "r39"
 
 SRC_URI = "cvs://cvs:@pubcvs.arm.linux.org.uk/mnt/src/cvsroot;module=tslib \
            file://usec_fix.patch;patch=1 \