4 files changed, 4 insertions, 41 deletions
diff --git a/packages/opie-calculator/opie-calculator.inc b/packages/opie-calculator/opie-calculator.inc
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/opie-calculator/opie-calculator.inc
diff --git a/packages/opie-calculator/opie-calculator_1.1.9.bb b/packages/opie-calculator/opie-calculator_1.1.9.bb
deleted file mode 100644
index ef22da1f91..0000000000
--- a/packages/opie-calculator/opie-calculator_1.1.9.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-DESCRIPTION = "Calculator"
-SECTION = "opie/applications"
-PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
-LICENSE = "GPL"
-
-APPNAME = "calculator"
-
-
-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"
-
-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/
-}
-
diff --git a/packages/opie-calculator/opie-calculator_1.2.0.bb b/packages/opie-calculator/opie-calculator_1.2.0.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/opie-calculator/opie-calculator_1.2.0.bb
diff --git a/packages/opie-calculator/opie-calculator_cvs.bb b/packages/opie-calculator/opie-calculator_cvs.bb
index c7f187a146..999f8ef69e 100644
--- a/packages/opie-calculator/opie-calculator_cvs.bb
+++ b/packages/opie-calculator/opie-calculator_cvs.bb
@@ -1,22 +1,8 @@
-DESCRIPTION = "Calculator"
-SECTION = "opie/applications"
-PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
-LICENSE = "GPL"
-PV = "1.1.9+cvs-${CVSDATE}"
-APPNAME = "calculator"
+include ${PN}.inc
+    
+PV = "1.2.0+cvs-${CVSDATE}"
+PR = "r0"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/tools/calculator \
            ${HANDHELDS_CVS};module=opie/pics \
            ${HANDHELDS_CVS};module=opie/apps"
-
-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/
-}
-