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 "