diff options
| author | Paul Sokolovsky <pmiscml@gmail.com> | 2007-01-14 10:05:15 +0000 |
|---|---|---|
| committer | Paul Sokolovsky <pmiscml@gmail.com> | 2007-01-14 10:05:15 +0000 |
| commit | 23a152887750570b91dd0799a94cdf235b99deef (patch) | |
| tree | 50fb63533b7d37de4a67c70f4af0410bcae705df | |
| parent | 1678762e9bdf9c49015bd398d6ae1a4c190b67e6 (diff) | |
opie-taskbar: Remove overriden opie startup file for htcuinversal
* This contained (comparing to the default) only explicit QWS_MOUSE_PROTO &
QWS_KEYBOARD assignments, and it htcuinversal was confirmed to work without
them.
| -rw-r--r-- | packages/opie-taskbar/opie-taskbar/htcuniversal/opie | 82 | ||||
| -rw-r--r-- | packages/opie-taskbar/opie-taskbar_1.2.2.bb | 2 | ||||
| -rw-r--r-- | packages/opie-taskbar/opie-taskbar_cvs.bb | 2 |
3 files changed, 2 insertions, 84 deletions
diff --git a/packages/opie-taskbar/opie-taskbar/htcuniversal/opie b/packages/opie-taskbar/opie-taskbar/htcuniversal/opie deleted file mode 100644 index ac8cf18df4..0000000000 --- a/packages/opie-taskbar/opie-taskbar/htcuniversal/opie +++ /dev/null @@ -1,82 +0,0 @@ -#!/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.2.bb b/packages/opie-taskbar/opie-taskbar_1.2.2.bb index d5d947783c..384fbd0ec8 100644 --- a/packages/opie-taskbar/opie-taskbar_1.2.2.bb +++ b/packages/opie-taskbar/opie-taskbar_1.2.2.bb @@ -1,5 +1,5 @@ require ${PN}.inc -PR = "r3" +PR = "r4" 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 3d770a55dc..38172af970 100644 --- a/packages/opie-taskbar/opie-taskbar_cvs.bb +++ b/packages/opie-taskbar/opie-taskbar_cvs.bb @@ -1,6 +1,6 @@ require ${PN}.inc PV = "${OPIE_CVS_PV}" -PR = "r3" +PR = "r4" SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/calibrate \ ${HANDHELDS_CVS};module=opie/noncore/settings/mediummount \ |