summaryrefslogtreecommitdiff
path: root/packages/opie-taskbar
diff options
context:
space:
mode:
authorRod Whitby <rod@whitby.id.au>2005-01-14 14:06:37 +0000
committerRod Whitby <rod@whitby.id.au>2005-01-14 14:06:37 +0000
commit182573fdba68b6fe20942ac93ded46909663e37b (patch)
treec841a01aff4ff23f46f47cb1f78bc17fffec1bac /packages/opie-taskbar
parent4148cabf119303c0a6ceddd4d8c4ed2abb669cc9 (diff)
Merge bk://nslu2-linux@nslu2-linux.bkbits.net/openembedded
into home.(none):/home/slug/openembedded 2005/01/14 06:05:21-08:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/01/13 15:05:24-06:00 ti.com!kergoth Import '[PATCH] more trailing spaces and missing quotes' from Marc Singer. 2005/01/13 15:02:51-06:00 ti.com!kergoth Add a /etc/network/interfaces file for coLinux. 2005/01/13 13:24:50-06:00 ti.com!kergoth Merge oe-devel@oe-devel.bkbits.net:openembedded into odin.sc.ti.com:/home/kergoth/code/user/oe/openembedded 2005/01/13 13:24:42-06:00 ti.com!kergoth Fix btxml and devmem2 to stop working around the do_unpack bug I just fixed. 2005/01/13 18:33:04+00:00 cambridgebroadband.com!rjt Merge oe-devel@oe-devel.bkbits.net:openembedded into flotta.cambridgebroadband.com:/development/openembedded/openembedded 2005/01/13 13:14:19-06:00 ti.com!kergoth Add lemon, an LALR(1) parser generator. 2005/01/13 13:09:04-06:00 ti.com!kergoth BUGFIX in do_unpack: only create a relative directory structure in WORKDIR when unpacking using cp if the type is file:// (FILESPATH handling). 2005/01/13 12:30:36-06:00 ti.com!kergoth Merge oe-devel@oe-devel.bkbits.net:openembedded into odin.sc.ti.com:/home/kergoth/code/user/oe/openembedded 2005/01/13 18:29:26+00:00 cambridgebroadband.com!rjt update PR on openzaurus-pxa 2005/01/13 12:27:56-06:00 ti.com!kergoth Update klibc to 0.190, the latest stable version. 2005/01/13 18:11:50+00:00 cambridgebroadband.com!rjt make select work on the apm device for tosa,corgi,poodle and related archictectures 2005/01/13 09:10:02+01:00 hrw.one.pl!hrw justreader: fix Settings file location (fix #204) 2005/01/13 00:32:44+00:00 rpsys.net!RP Fix after merge 2005/01/13 00:26:37+00:00 rpsys.net!RP Merge 2005/01/13 00:23:32+00:00 rpsys.net!RP openzaurus-2.6: Switch to 2.6.11-rc1. Remove patches now merged upstream (8 of them). Add patches to fix upstream bug (reported). Improve MMC driver. 2005/01/12 23:02:21+00:00 nexus.co.uk!pb Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into stealth.nexus.co.uk:/home/pb/oe/oe 2005/01/12 23:02:08+00:00 nexus.co.uk!pb fix some postinst/postrm issues in module-init-tools 2005/01/12 23:52:41+01:00 uni-frankfurt.de!mickeyl make the check and the WARNING also work for kernel 2.6.x 2005/01/12 20:32:37+01:00 uni-frankfurt.de!mickeyl improve readme for prism3-firmware 2005/01/12 20:03:32+01:00 uni-frankfurt.de!mickeyl fix qte crashing right after calibration (again). patch courtesy qte-uberhacker Holger 'Zecke' Freyther 2005/01/12 18:42:20+01:00 (none)!br1 added package yamonenv (inside nylon/): read any write yamon environment 2005/01/12 16:40:38+01:00 uni-frankfurt.de!mickeyl add wireless tools v27 2005/01/12 16:05:25+01:00 uni-frankfurt.de!mickeyl upgrade bison to 2.0 2005/01/12 16:04:20+01:00 uni-frankfurt.de!mickeyl use pregenerated yacc files in kgrog. still nonworky though 2005/01/12 12:35:05+01:00 uni-frankfurt.de!mickeyl pcmcia-cs: don't ship config.opts on arm machines 2005/01/12 11:51:05+01:00 uni-frankfurt.de!mickeyl CONFIG_FEATURE_IFUPDOWN_MAPPING=y in busybox defconfig. This adds just 3K but is very useful 2005/01/12 10:27:23+01:00 hrw.one.pl!hrw Merge bk://oe-devel@oe-devel.bkbits.net/openembedded/ into home.hrw.one.pl:/home/hrw/zaurus/bb/openembedded 2005/01/12 10:26:59+01:00 hrw.one.pl!hrw changed tremor SRC_URI to fetch from svn via http 2005/01/12 08:26:26+00:00 rpsys.net!RP Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into tim.rpsys.net:/usr/tmp6/openembedded 2005/01/12 08:26:12+00:00 rpsys.net!RP openzaurus-2.6: Update corgi after pushing code upstream 2005/01/12 00:12:52+01:00 hrw.one.pl!hrw Merge bk://oe-devel@oe-devel.bkbits.net/openembedded/ into home.hrw.one.pl:/home/hrw/zaurus/bb/openembedded 2005/01/12 00:12:18+01:00 hrw.one.pl!hrw updated kdepimpi to 1.9.16 (also added their fork of gammu) 2005/01/11 23:46:19+01:00 uni-frankfurt.de!mickeyl ipkg-utils has been fixed upstream 2005/01/11 23:39:28+01:00 uni-frankfurt.de!mickeyl Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages 2005/01/11 17:09:51-06:00 ti.com!kergoth Merge oe-devel@oe-devel.bkbits.net:openembedded into odin.sc.ti.com:/home/kergoth/code/user/oe/openembedded 2005/01/11 17:09:37-06:00 ti.com!kergoth Add OpenNTPD, a free NTP implementation from the OpenBSD guys. 2005/01/11 23:39:20+01:00 uni-frankfurt.de!mickeyl opie: use Transformed:Rot0 instead of LinuxFb for kernel 2.6 2005/01/11 21:36:12+01:00 uni-frankfurt.de!mickeyl ship libopie2 examples in libopie2_cvs 2005/01/11 21:30:53+01:00 uni-frankfurt.de!mickeyl Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages 2005/01/11 21:30:43+01:00 uni-frankfurt.de!mickeyl machine.confs: catchup with changes in orinoco package granularity 2005/01/11 20:24:29+00:00 nexus.co.uk!pb remove spurious DEPENDS 2005/01/11 20:58:09+01:00 uni-frankfurt.de!mickeyl orinoco-modules: use KERNEL_OBJECT_SUFFIX and increase package granularity 2005/01/11 20:37:02+01:00 uni-frankfurt.de!mickeyl hostap-modules: use KERNEL_OBJECT_SUFFIX to make it work w/ old and new kernels 2005/01/11 20:21:51+01:00 uni-frankfurt.de!mickeyl set KERNEL_OBJECT_SUFFIX to .ko on 2.6 kernels and .o for earlier kernels 2005/01/11 16:57:01+00:00 rpsys.net!RP openzaurus-2.6: update patch order. Add MMC and SD support 2005/01/11 16:59:54+01:00 (none)!br1 /bin/sh update-alternative calls have to be done in prerm not postrm 2005/01/11 10:22:15-06:00 ti.com!kergoth Merge oe-devel@oe-devel.bkbits.net:openembedded into odin.sc.ti.com:/home/kergoth/code/user/oe/openembedded 2005/01/11 10:22:07-06:00 ti.com!kergoth Add fnmatch test result to some arm*linux* site files. 2005/01/11 12:05:37+01:00 (none)!br1 added "dash" shell 2005/01/10 20:20:01-06:00 ti.com!kergoth Merge oe-devel@oe-devel.bkbits.net:openembedded into odin.sc.ti.com:/home/kergoth/code/user/oe/openembedded 2005/01/10 20:19:53-06:00 ti.com!kergoth Add OpenCVS from cvs. 2005/01/10 23:26:51+01:00 uni-frankfurt.de!mickeyl Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into merlin.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages 2005/01/10 16:34:16-06:00 ti.com!kergoth Merge oe-devel@oe-devel.bkbits.net:openembedded into odin.sc.ti.com:/home/kergoth/code/user/oe/openembedded 2005/01/10 16:34:07-06:00 ti.com!kergoth Fix unionfs 1.0.6 make.patch. 2005/01/10 23:26:28+01:00 uni-frankfurt.de!mickeyl it's irk-targus and irk-belkin, not irk-0.11.0 and irk-0.11.1 :( 2005/01/10 20:54:21+01:00 hrw.one.pl!hrw Merge bk://oe-devel@oe-devel.bkbits.net/openembedded/ into home.hrw.one.pl:/home/hrw/zaurus/bb/openembedded 2005/01/10 14:40:45-06:00 ti.com!kergoth Merge oe-devel@oe-devel.bkbits.net:openembedded into odin.sc.ti.com:/home/kergoth/code/user/oe/openembedded 2005/01/10 14:40:33-06:00 ti.com!kergoth Add didiwiki 0.5. 2005/01/10 20:54:06+01:00 hrw.one.pl!hrw added KGrok into nonworking (I dont know how to fix it's usage of yacc) 2005/01/10 18:52:01+01:00 (none)!koen add matchbox-desktop_svn 2005/01/10 18:42:31+01:00 (none)!koen add matchbox_panel_svn 2005/01/10 18:28:27+01:00 (none)!koen add matchbox-wm_svn 2005/01/10 18:09:30+01:00 (none)!koen Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into lieve.(none):/data/build/oe/clean-tree/openembedded 2005/01/10 18:09:12+01:00 (none)!koen add libmatchbox_svn 2005/01/10 17:38:04+01:00 uni-frankfurt.de!mickeyl add some extra depends for openzaurus-pxa-2.6 2005/01/10 17:30:19+01:00 (none)!koen Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into lieve.(none):/data/build/oe/clean-tree/openembedded 2005/01/10 17:29:57+01:00 (none)!koen delete unneeded patches for faad2 2005/01/10 17:27:22+01:00 (none)!koen libgpevtype 0.6 in familiar-0.8.0.conf 2005/01/10 14:08:45+01:00 mn-solutions.de!schurig removed cruft 2005/01/10 13:09:37+01:00 (none)!koen don't set PREFERRED_VERSION for gtk+ and bluetooth/dbus in familiar-0.8.1.conf 2005/01/09 20:24:58+00:00 nexus.co.uk!pb add dependency on xpm 2005/01/09 20:22:42+00:00 nexus.co.uk!pb add gnocky 2005/01/09 20:21:04+00:00 nexus.co.uk!pb Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into stealth.nexus.co.uk:/home/pb/oe/oe 2005/01/09 20:20:54+00:00 nexus.co.uk!pb add staging to gnokii 2005/01/09 20:19:35+00:00 rpsys.net!RP Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into tim.rpsys.net:/usr/tmp6/openembedded 2005/01/09 20:18:32+00:00 rpsys.net!RP openzaurus-2.6: Update and use changes to SSP made in 2.6 bk tree (imported by ssp.patch) 2005/01/09 21:12:14+01:00 uni-frankfurt.de!mickeyl Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages 2005/01/09 21:11:58+01:00 uni-frankfurt.de!mickeyl remove bogus stuff in opie-keytabs 2005/01/09 19:59:57+00:00 nexus.co.uk!pb Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into stealth.nexus.co.uk:/home/pb/oe/oe 2005/01/09 19:59:40+00:00 nexus.co.uk!pb add gnokii 2005/01/09 18:45:34+01:00 uni-frankfurt.de!mickeyl Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into merlin.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages 2005/01/09 18:45:18+01:00 uni-frankfurt.de!mickeyl openzaurus 3.5.3.conf: use opie-cvs for now 2005/01/09 17:27:13+00:00 nexus.co.uk!pb add missing file 2005/01/09 17:21:59+00:00 nexus.co.uk!pb Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into stealth.nexus.co.uk:/home/pb/oe/oe 2005/01/09 17:21:42+00:00 nexus.co.uk!pb demote pciutils and usbutils from Recommends to Suggests in hotplug 2005/01/09 18:11:18+01:00 handhelds.org!CoreDump Remove ressource.patch from libqpe-opie_1.1.8 as it has been applied upstream 2005/01/09 17:01:46+00:00 rpsys.net!RP Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into tim.rpsys.net:/usr/tmp6/openembedded 2005/01/09 17:01:32+00:00 rpsys.net!RP openzaurus-2.6: changes to help push patches upstream. Break poodle for now... 2005/01/09 17:00:18+00:00 rpsys.net!RP openzaurus-2.6: changes to patches to assist with pushing upstream. Break poodle for now :-/ 2005/01/09 16:07:24+01:00 dyndns.org!reenoo rosetta: it's pkg_postinst, not do_postinst 2005/01/09 14:24:35+00:00 nexus.co.uk!pb update libgpevtype to 0.6 2005/01/09 14:03:18+00:00 nexus.co.uk!pb update gtk+ to 2.6.1 2005/01/09 14:02:36+00:00 nexus.co.uk!pb update glib-2.0 to 2.6.1 2005/01/09 14:01:31+00:00 nexus.co.uk!pb remove some extraneous gtk+ patches 2005/01/09 14:00:43+00:00 nexus.co.uk!pb second attempt at fixing gpe-bluetooth dbus naming problems 2005/01/09 14:57:37+01:00 dyndns.org!reenoo sysvinit: use update-alternatives.bbclass. put PACKAGES/FILES related things in a single place. 2005/01/09 00:47:25+00:00 nexus.co.uk!pb apply patch from Marc Singer to remove spurious trailing space from backslash-continued line 2005/01/09 00:46:13+00:00 nexus.co.uk!pb apply patch from Marc Singer to remove spurious trailing space from backslash-continued line 2005/01/09 00:42:35+00:00 nexus.co.uk!pb apply patch from Paul Eggleton to add usbf and bnep0 entries to interfaces file use CONFFILES for netbase under all DISTROs, not just nylon 2005/01/09 00:38:50+00:00 nexus.co.uk!pb apply patch from Paul Eggleton to fix usbnet hotplug on iPAQ 2005/01/09 00:29:52+00:00 nexus.co.uk!pb Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into stealth.nexus.co.uk:/home/pb/oe/oe 2005/01/09 00:29:41+00:00 nexus.co.uk!pb apply patch from Marc Singer to correct typo in gpe-package 2005/01/08 15:16:29-08:00 (none)!emte Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into t.(none):/home/OE/speedracer/packages 2005/01/08 15:14:54-08:00 (none)!emte removed kbdd-patched 2005/01/08 16:49:42-05:00 handhelds.org!kergoth Add unionfs 1.0.6. 2005/01/08 20:14:46+00:00 nexus.co.uk!pb Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into stealth.nexus.co.uk:/home/pb/oe/oe 2005/01/08 20:14:26+00:00 nexus.co.uk!pb remove figment from gpe base set due to libxml2 dependency 2005/01/08 18:46:11+00:00 rpsys.net!RP openzaurus-2.6: corgi updates: make MAGIC_SYSRQ work + fix reboot bug. w100fb updates for mainline acceptance. 2005/01/08 18:01:30+00:00 nexus.co.uk!pb apply patch from Bob Davies to remove kismet from meta-sectest-gpe 2005/01/08 18:37:36+01:00 hrw.one.pl!hrw added description to librsvg 2005/01/08 18:37:12+01:00 hrw.one.pl!hrw added description to libart-lgpl 2005/01/08 18:36:26+01:00 hrw.one.pl!hrw added description to esound 2005/01/08 18:13:19+01:00 hrw.one.pl!hrw fixed description for Busybox 2005/01/08 18:04:49+01:00 hrw.one.pl!hrw added description to atd BKrev: 41e7d1ednFJIdPS8nrzP9S2cq5B_1A
Diffstat (limited to 'packages/opie-taskbar')
-rw-r--r--packages/opie-taskbar/opie-taskbar/openzaurus-pxa-2.6/opie89
-rw-r--r--packages/opie-taskbar/opie-taskbar_1.1.8.bb133
-rw-r--r--packages/opie-taskbar/opie-taskbar_cvs.bb2
3 files changed, 223 insertions, 1 deletions
diff --git a/packages/opie-taskbar/opie-taskbar/openzaurus-pxa-2.6/opie b/packages/opie-taskbar/opie-taskbar/openzaurus-pxa-2.6/opie
index e69de29bb2..ed0426f3ca 100644
--- a/packages/opie-taskbar/opie-taskbar/openzaurus-pxa-2.6/opie
+++ b/packages/opie-taskbar/opie-taskbar/openzaurus-pxa-2.6/opie
@@ -0,0 +1,89 @@
+#!/bin/sh
+#
+[ -z $LOGNAME ] && export LOGNAME=root && export HOME=/root
+[ -z $HOME ] && export 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
+# FIXME: add check for qt version here. the statement above applies to qt >=2.3.9
+# export QWS_KEYBOARD=KernelTTY
+
+export QWS_DISPLAY=Transformed:Rot0:0
+
+if [ ! -x "$OPIEDIR/bin/qpe" ] ; then
+ echo Opie not installed
+ exit 0
+fi
+
+. /etc/profile
+
+if [ ! -e "$HOME/Settings/qpe.conf" ] ; then
+ echo "Copying default qpe.conf into $HOME/Settings/"
+ mkdir -p $HOME/Settings/
+ cat $OPIEDIR/etc/skel/qpe.conf >$HOME/Settings/qpe.conf
+fi
+
+if [ ! -e "$HOME/Settings/locale.conf" -a -e "$OPIEDIR/etc/skel/locale.conf" ] ; then
+ cat $OPIEDIR/etc/skel/locale.conf >$HOME/Settings/locale.conf
+fi
+
+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
+
+if [ ! -e "/home/root" ] ; then
+ ln -sf /root /home
+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
+ killall opie-login
+ killall quicklauncher
+
+ ;;
+
+'restart')
+ $0 stop && $0 start
+
+ ;;
+
+*)
+ echo "usage: $0 { start | stop | restart }"
+
+ ;;
+
+esac
+
diff --git a/packages/opie-taskbar/opie-taskbar_1.1.8.bb b/packages/opie-taskbar/opie-taskbar_1.1.8.bb
index e69de29bb2..3ca5b2902b 100644
--- a/packages/opie-taskbar/opie-taskbar_1.1.8.bb
+++ b/packages/opie-taskbar/opie-taskbar_1.1.8.bb
@@ -0,0 +1,133 @@
+DESCRIPTION = "Opie Launcher and Taskbar"
+SECTION = "opie/base"
+PRIORITY = "optional"
+LICENSE = "GPL"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+DEPENDS = "opie-libqrsync"
+PR = "r3"
+APPNAME = "qpe"
+
+TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/calibrate \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/mediummount \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/core/launcher \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/root \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/etc \
+ file://nomax.patch;patch=1;pnum=3 \
+ file://server.pro-1.1.8 \
+ file://opie-reorgfiles \
+ file://opie \
+ file://qpe.conf \
+ file://opie_defaults"
+
+S = "${WORKDIR}/launcher"
+
+CXXFLAGS_append_husky = " -DOPIE_NO_WINDOWED "
+CXXFLAGS_append_corgi = " -DOPIE_NO_WINDOWED "
+CXXFLAGS_append_shepherd = " -DOPIE_NO_WINDOWED "
+CXXFLAGS_append_tosa = " -DOPIE_NO_WINDOWED "
+
+# Caps/Numlock icons for devices with keyboard
+EXTRA_QMAKEVARS_POST_append_collie = "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE"
+EXTRA_QMAKEVARS_POST_append_poodle = "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE"
+EXTRA_QMAKEVARS_POST_append_shepherd = "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE"
+EXTRA_QMAKEVARS_POST_append_corgi = "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE"
+EXTRA_QMAKEVARS_POST_append_husky = "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE"
+EXTRA_QMAKEVARS_POST_append_tosa = "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE"
+
+# Wallpaper and welcome splash
+PIXMAP_SIZE = ""
+PIXMAP_SIZE_shepherd = "-640x480"
+PIXMAP_SIZE_corgi = "-640x480"
+PIXMAP_SIZE_husky = "-640x480"
+# PIXMAP_SIZE_tosa = "-640x480"
+PIXMAP_SIZE_simpad = "-800x600"
+
+inherit opie update-rc.d
+
+INITSCRIPT_NAME = "opie"
+INITSCRIPT_PARAMS = "defaults 99"
+
+do_configure_prepend() {
+ ln -s ${WORKDIR}/calibrate ${S}/calibrate
+ ln -s ${WORKDIR}/mediummount ${S}/mediummount
+ install -m 0644 ${WORKDIR}/server.pro-1.1.8 ${S}/server.pro
+}
+
+do_stage() {
+ install obexinterface.h ${STAGING_INCDIR}/
+
+}
+
+SECTIONS = "1Pim Applications Examples Games Opie-SH Python Settings"
+PICS = "opielogo32x32.png start_button.png new_wait.png opielogo16x16.png sidebar.png"
+
+do_install() {
+ install -d ${D}/${palmtopdir}/bin
+ for i in ${SECTIONS}
+ do
+ install -d ${D}/${palmtopdir}/apps/$i/
+ install -m 0644 ${WORKDIR}/apps/$i/.directory ${D}/${palmtopdir}/apps/$i/
+ done
+ install -d ${D}/${palmtopdir}/pics/launcher
+ install -d ${D}/${palmtopdir}/pics/logo
+ install -d ${D}/${palmtopdir}/pics/RoH/star/
+ install -d ${D}/etc/init.d
+ install -d ${D}/etc/profile.d
+ install -d ${D}/${palmtopdir}/etc/colors
+ install -d ${D}/${palmtopdir}/etc/skel
+
+ install -m 0755 ${S}/qpe ${D}/${palmtopdir}/bin/qpe
+ install -m 0755 ${WORKDIR}/opie-reorgfiles ${D}/${palmtopdir}/bin/
+ install -m 0644 ${WORKDIR}/apps/Settings/calibrate.desktop ${D}/${palmtopdir}/apps/Settings/
+ install -m 0644 ${WORKDIR}/apps/Settings/quit.desktop ${D}/${palmtopdir}/apps/Settings/
+ install -m 0644 ${WORKDIR}/opie_defaults ${D}/etc/profile.d/
+
+ for p in ${PICS}
+ do
+ install -m 0644 ${WORKDIR}/pics/launcher/$p ${D}/${palmtopdir}/pics/launcher/$p
+ done
+ install -m 0644 ${WORKDIR}/pics/launcher/firstuse${PIXMAP_SIZE}.jpg ${D}/${palmtopdir}/pics/launcher/firstuse.jpg
+ install -m 0644 ${WORKDIR}/pics/launcher/opie-background${PIXMAP_SIZE}.jpg ${D}/${palmtopdir}/pics/launcher/opie-background.jpg
+
+ install -m 0644 ${WORKDIR}/pics/logo/*.* ${D}/${palmtopdir}/pics/logo/
+ install -m 0644 ${WORKDIR}/pics/RoH/star/*.png ${D}/${palmtopdir}/pics/RoH/star/
+
+ install -m 0644 ${WORKDIR}/etc/colors/*.scheme ${D}/${palmtopdir}/etc/colors/
+ install -m 0644 ${WORKDIR}/etc/mime.types ${D}/etc/
+
+ install -m 0755 ${WORKDIR}/opie ${D}/etc/init.d/opie
+ install -m 0644 ${WORKDIR}/qpe.conf ${D}/${palmtopdir}/etc/skel/
+}
+
+# These two should be installed only on devices with keyboard
+do_install_append_collie () {
+ install -m 0644 ${WORKDIR}/pics/capslock.xpm ${D}/${palmtopdir}/pics/
+ install -m 0644 ${WORKDIR}/pics/numlock.xpm ${D}/${palmtopdir}/pics/
+}
+do_install_append_poodle () {
+ install -m 0644 ${WORKDIR}/pics/capslock.xpm ${D}/${palmtopdir}/pics/
+ install -m 0644 ${WORKDIR}/pics/numlock.xpm ${D}/${palmtopdir}/pics/
+}
+do_install_append_corgi () {
+ install -m 0644 ${WORKDIR}/pics/capslock.xpm ${D}/${palmtopdir}/pics/
+ install -m 0644 ${WORKDIR}/pics/numlock.xpm ${D}/${palmtopdir}/pics/
+}
+do_install_append_shepherd () {
+ install -m 0644 ${WORKDIR}/pics/capslock.xpm ${D}/${palmtopdir}/pics/
+ install -m 0644 ${WORKDIR}/pics/numlock.xpm ${D}/${palmtopdir}/pics/
+}
+do_install_append_husky () {
+ install -m 0644 ${WORKDIR}/pics/capslock.xpm ${D}/${palmtopdir}/pics/
+ install -m 0644 ${WORKDIR}/pics/numlock.xpm ${D}/${palmtopdir}/pics/
+}
+do_install_append_tosa () {
+ install -m 0644 ${WORKDIR}/pics/capslock.xpm ${D}/${palmtopdir}/pics/
+ install -m 0644 ${WORKDIR}/pics/numlock.xpm ${D}/${palmtopdir}/pics/
+}
+
+FILES_opie-taskbar_append = " /etc /etc/profile.d ${palmtopdir}/apps ${palmtopdir}/pics"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/packages/opie-taskbar/opie-taskbar_cvs.bb b/packages/opie-taskbar/opie-taskbar_cvs.bb
index 5488c7b148..acc566271f 100644
--- a/packages/opie-taskbar/opie-taskbar_cvs.bb
+++ b/packages/opie-taskbar/opie-taskbar_cvs.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
MAINTAINER = "Team Opie <opie@handhelds.org>"
DEPENDS = "opie-libqrsync"
PV = "1.1.8+cvs-${CVSDATE}"
-PR = "r1"
+PR = "r2"
APPNAME = "qpe"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/calibrate \