Merge bk://nslu2-linux@nslu2-linux.bkbits.net/openembedded

into home.(none):/home/bitkeeper/openembedded

2005/05/13 23:24:15-07:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into  bkbits.net:/repos/n/nslu2-linux/openembedded

2005/05/13 23:11:16+02:00 handhelds.org!zecke
libsdl-qpe:
	Patch by Gints Polis to fix the rotation for h38xx iPAQ
	models.

2005/05/13 22:38:41+02:00 handhelds.org!zecke
Qt 2.3.10:
	Patch Qt to support Right To Left scripting of text.
	Patch is courtsey ALynch, the Makefile.in changes are
	done by myself

2005/05/13 12:27:57+02:00 hrw.one.pl!hrw
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded/
into home.hrw.one.pl:/home/hrw/zaurus/oe/openembedded

2005/05/13 12:27:36+02:00 hrw.one.pl!hrw
added opie-icon-reload to opie-image - it is small and usefull

2005/05/13 12:13:04+02: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/05/13 12:12:52+02:00 uni-frankfurt.de!mickeyl
apply the libqpe fix-titleheight patch for the cvs version as well, since I feel uncomfortable pushing it upstream

2005/05/13 11:36:47+02:00 hrw.one.pl!hrw
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded/
into home.hrw.one.pl:/home/hrw/zaurus/oe/openembedded

2005/05/13 11:33:38+02:00 hrw.one.pl!hrw
opie-calculator: add files from etc/ to get unit conversations work - patch by Gints Polis

2005/05/13 10:25:00+01:00 rpsys.net!RP
bump

2005/05/13 10:22:43+01:00 rpsys.net!RP
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into tim.rpsys.net:/usr/oe/openembedded

2005/05/13 10:12:15+01:00 rpsys.net!RP
linux-oz-2.6: Fix suspend/resume issue + add mmc timeout fix

2005/05/13 01:12:31+02:00 uni-frankfurt.de!mickeyl
add pcmciautils 003

2005/05/13 00:45:29+02:00 uni-frankfurt.de!mickeyl
add infrared and ppp modules to c7x0 bootstrap image (kernel 2.6)

2005/05/13 00:23:22+02:00 uni-frankfurt.de!mickeyl
remove meta-grant and gpe-image-grant: please don't commit private .bb files

2005/05/13 00:11:21+02:00 uni-frankfurt.de!mickeyl
spectrum_cs: catch up with linux 2.6.12

2005/05/12 23:54:13+02:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into gandalf.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2005/05/12 23:45:30+02:00 uni-frankfurt.de!mickeyl
remove opie-mobilemsg, it has been removed upstream also

2005/05/12 23:09:32+02:00 utwente.nl!koen
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into bitbake.utwente.nl:/home/koen/OE/openembedded

2005/05/12 23:08:58+02:00 utwente.nl!koen
Add kanatest_0.3.6.bb, kanatest.inc, kanatest.desktop, courtesy Robert Marcano

2005/05/12 20:32:38+01:00 nexus.co.uk!pb
new xinerama snapshot


2005/05/12 20:30:35+01:00 nexus.co.uk!pb
use linux-core directory instead of linux

2005/05/12 20:29:34+01:00 nexus.co.uk!pb
update xserver-xorg to 6.8.99.5


2005/05/12 20:27:09+01:00 nexus.co.uk!pb
update mythtv to 0.17


2005/05/12 20:26:18+01:00 nexus.co.uk!pb
correct "--enablee" typo in mythtv_0.16


2005/05/12 20:20:30+01:00 nexus.co.uk!pb
Merge bk://oe-devel@openembedded-devel.bkbits.net/openembedded
into mill.nexus.co.uk:/nexus/home/pb/oe/oe

2005/05/09 09:10:48+01:00 nexus.co.uk!pb
add CELF busybox patch for more ash builtins

BKrev: 42859a7e_yqKTfUGEQQRWFA_fBpqQQ

3 files changed, 32 insertions, 3 deletions

diff --git a/packages/opie-calculator/opie-calculator.inc b/packages/opie-calculator/opie-calculator.inc
index e69de29bb2..d4c46e9eb4 100644
--- a/packages/opie-calculator/opie-calculator.inc
+++ b/packages/opie-calculator/opie-calculator.inc
@@ -0,0 +1,20 @@
+DESCRIPTION = "Calculator"
+SECTION = "opie/applications"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+APPNAME = "calculator"
+
+
+S = "${WORKDIR}/${APPNAME}"
+
+inherit opie
+
+# FILES plugins/application/libcalculator.so* bin/calculator apps/Applications/calculator.desktop etc/unit_conversion.dat pics/calc
+do_install() {
+        install -d ${D}${palmtopdir}/pics/calc/
+        install -m 0644 ${WORKDIR}/pics/calc/*.png ${D}${palmtopdir}/pics/calc/
+        install -d ${D}${palmtopdir}/etc/
+        install -m 0644 ${WORKDIR}/etc/unit_conversion.dat ${D}${palmtopdir}/etc/
+}
+
diff --git a/packages/opie-calculator/opie-calculator_1.2.0.bb b/packages/opie-calculator/opie-calculator_1.2.0.bb
index e69de29bb2..49f1944b85 100644
--- a/packages/opie-calculator/opie-calculator_1.2.0.bb
+++ b/packages/opie-calculator/opie-calculator_1.2.0.bb
@@ -0,0 +1,8 @@
+include ${PN}.inc
+
+PR = "r1"
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/tools/calculator \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/etc"
diff --git a/packages/opie-calculator/opie-calculator_cvs.bb b/packages/opie-calculator/opie-calculator_cvs.bb
index 999f8ef69e..30b0675b0c 100644
--- a/packages/opie-calculator/opie-calculator_cvs.bb
+++ b/packages/opie-calculator/opie-calculator_cvs.bb
@@ -1,8 +1,9 @@
 include ${PN}.inc
-    
+
 PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/tools/calculator \
            ${HANDHELDS_CVS};module=opie/pics \
-           ${HANDHELDS_CVS};module=opie/apps"
+           ${HANDHELDS_CVS};module=opie/apps \
+           ${HANDHELDS_CVS};module=opie/etc "