Merge bk://openembedded@openembedded.bkbits.net/packages

into home.hrw.one.pl:/home/szczepan/zaurus/oe/packages

2004/06/27 21:35:44+02:00 hrw.one.pl!hrw
few opie fixes

BKrev: 40df21efAzBvtyyY3d-EZwVflLjNYw

diff --git a/korganizer/kopi_1.7.8.oe b/korganizer/kopi_1.7.8.oe
index 93db942..0e133b3 100644 (file)
--- a/korganizer/kopi_1.7.8.oe
+++ b/korganizer/kopi_1.7.8.oe
@@ -31,9 +31,9 @@ do_install() {
                ${D}/${palmtopdir}/pics/korganizer/icons16 \
                ${D}/${palmtopdir}/pics/korganizer/iconsmini \
                ${D}/${palmtopdir}/plugins/applets
-    install -m 0644 ${S}/bin/pics/*.png ${D}/${palmtopdir}/pics
-    install -m 0644 ${S}/bin/pics/*.wav ${D}/${palmtopdir}/pics
-    install -m 0644 ${S}/bin/pics/*.txt ${D}/${palmtopdir}/pics
+    install -m 0644 ${S}/bin/pics/*.png ${D}/${palmtopdir}/pics/korganizer
+    install -m 0644 ${S}/bin/pics/*.wav ${D}/${palmtopdir}/pics/korganizer
+    install -m 0644 ${S}/bin/pics/*.txt ${D}/${palmtopdir}/pics/korganizer
     install -m 0644 ${S}/bin/pics/ko*.png ${D}/${palmtopdir}/pics/korganizer
     install -m 0644 ${S}/bin/pics/icons16/*.png ${D}/${palmtopdir}/pics/korganizer/icons16
     install -m 0644 ${S}/bin/pics/iconsmini/*.png ${D}/${palmtopdir}/pics/korganizer/iconsmini

diff --git a/opie-notesapplet/opie-notesapplet_cvs.oe b/opie-notesapplet/opie-notesapplet_cvs.oe
index e69de29..5914e85 100644 (file)
--- a/opie-notesapplet/opie-notesapplet_cvs.oe
+++ b/opie-notesapplet/opie-notesapplet_cvs.oe
@@ -0,0 +1,34 @@
+DESCRIPTION = "Notes Applet"
+SECTION = "opie/applets"
+PRIORITY = "optional"
+MAINTAINER = "Open Embedded <oe@handhelds.org>"
+LICENSE = "GPL"
+PV = "1.1.4-cvs-${CVSDATE}"
+APPNAME = "notesapplet"
+
+SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/applets/notesapplet;date=${CVSDATE}"
+
+S = "${WORKDIR}/${APPNAME}"
+
+inherit opie
+
+pkg_postinst() {
+#!/bin/sh
+if [ -n "$D" ]; then exit 1; fi
+if pidof -s qpe >/dev/null; then
+  /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
+else
+  exit 0
+fi
+}
+
+pkg_postrm() {
+#!/bin/sh
+if [ -n "$D" ]; then exit 1; fi
+/opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
+}
+
+# FILES plugins/applets/libnotesapplet.so*
+do_install() {
+}
+

diff --git a/opie-taskbar/opie-taskbar_cvs.oe b/opie-taskbar/opie-taskbar_cvs.oe
index 9a2d308..fb95805 100644 (file)
--- a/opie-taskbar/opie-taskbar_cvs.oe
+++ b/opie-taskbar/opie-taskbar_cvs.oe
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 DEPENDS = "opie-libqrsync "
 PV = "1.1.4-cvs-${CVSDATE}"
 APPNAME = "qpe"
-PR = "r5"
+PR = "r6"
 
 SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/apps/calibrate;date=${CVSDATE} \
            cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/settings/mediummount;date=${CVSDATE} \
@@ -48,14 +48,14 @@ do_install() {
        install -d ${D}/${palmtopdir}/pics/launcher
        install -d ${D}/${palmtopdir}/pics/logo
        install -d ${D}/etc/init.d
-       install -d ${D}/etc/colors
+       install -d ${D}/${palmtopdir}/etc/colors
 
        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/calibrate.desktop
        install -m 0644 ${WORKDIR}/pics/launcher/*.* ${D}/${palmtopdir}/pics/launcher/
        install -m 0644 ${WORKDIR}/pics/logo/*.* ${D}/${palmtopdir}/pics/logo/
-       install -m 0644 ${WORKDIR}/etc/colors/*.scheme ${D}/etc/colors/
+       install -m 0644 ${WORKDIR}/etc/colors/*.scheme ${D}/${palmtopdir}/etc/colors/
        install -m 0644 ${WORKDIR}/etc/mime.types ${D}/etc/
        oe_machinstall -m 0755 ${WORKDIR}/opie ${D}/etc/init.d/opie
 }