opie-memoryapplet: catch up w/ upstream

BKrev: 41fb592axr4p_U40i_neByA2EhiQaw

diff --git a/packages/opie-memoryapplet/opie-memoryapplet/memoryapplet.pro.patch b/packages/opie-memoryapplet/opie-memoryapplet/memoryapplet.pro.patch
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/packages/opie-memoryapplet/opie-memoryapplet_1.1.8.bb b/packages/opie-memoryapplet/opie-memoryapplet_1.1.8.bb
index e69de29..cd55823 100644 (file)
--- a/packages/opie-memoryapplet/opie-memoryapplet_1.1.8.bb
+++ b/packages/opie-memoryapplet/opie-memoryapplet_1.1.8.bb
@@ -0,0 +1,36 @@
+DESCRIPTION = "Memory Applet. \
+This applet displays the amount of free memory and manages the swap partition"
+SECTION = "opie/applets"
+PRIORITY = "optional"
+LICENSE = "GPL"
+PR = "r1"
+APPNAME = "memoryapplet"
+
+TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/applets/memoryapplet \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/sysinfo \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics"
+S = "${WORKDIR}/memoryapplet"
+
+inherit opie
+
+pkg_postinst() {
+#!/bin/sh
+if pidof -s qpe >/dev/null; then
+  /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
+fi
+ if [ -n "$D" ]; then false; fi
+}
+
+pkg_postrm() {
+#!/bin/sh
+/opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
+ if [ -n "$D" ]; then false; fi
+}
+
+do_install() {
+    install -d ${D}/${palmtopdir}/plugins/applets ${D}/${palmtopdir}/pics/memory/
+    install -m 0644 ${WORKDIR}/pics/memory/*.png ${D}/${palmtopdir}/pics/memory/
+    oe_libinstall -so libmemoryapplet ${D}/${palmtopdir}/plugins/applets/
+}
+

diff --git a/packages/opie-memoryapplet/opie-memoryapplet_cvs.bb b/packages/opie-memoryapplet/opie-memoryapplet_cvs.bb
index e15b05c..3cbc70a 100644 (file)
--- a/packages/opie-memoryapplet/opie-memoryapplet_cvs.bb
+++ b/packages/opie-memoryapplet/opie-memoryapplet_cvs.bb
@@ -4,13 +4,12 @@ SECTION = "opie/applets"
 PRIORITY = "optional"
 LICENSE = "GPL"
 PV = "1.1.8+cvs-${CVSDATE}"
+PR = "r1"
 APPNAME = "memoryapplet"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/applets/memoryapplet \
            ${HANDHELDS_CVS};module=opie/noncore/settings/sysinfo \
-           ${HANDHELDS_CVS};module=opie/pics \
-           file://memoryapplet.pro.patch;patch=1"
-
+           ${HANDHELDS_CVS};module=opie/pics"
 S = "${WORKDIR}/memoryapplet"
 
 inherit opie