Merge

2004/04/19 14:02:59-05:00 ti.com!a0868066
Merges.

2004/04/19 14:00:46-05:00 ti.com!a0868066
Killing usage of {} expansion, which isnt supported by the ash shell.

BKrev: 408494e2t24Aqbe2prpXURtnZlhCmA

2 files changed, 61 insertions, 1 deletions

diff --git a/korganizer/korganizer-embedded_1.5.0.oe b/korganizer/korganizer-embedded_1.5.0.oe
index 139b20c3fb..ff81c311dc 100644
--- a/korganizer/korganizer-embedded_1.5.0.oe
+++ b/korganizer/korganizer-embedded_1.5.0.oe
@@ -25,7 +25,10 @@ do_configure_prepend() {
 }
 
 do_install() {
-    install -d ${D}/opt/QtPalmtop/{bin,lib,apps/Pim,pics/korganizer/icons16}
+    install -d ${D}/${palmtopdir}/bin \
+	       ${D}/${palmtopdir}/lib \
+	       ${D}/${palmtopdir}/apps/Pim \
+       	       ${D}/${palmtopdir}/pics/korganizer/icons16
     install -m 0644 korganizer/korganizer.desktop ${D}/opt/QtPalmtop/apps/Pim/korganizer.desktop
     cd ${S}/pics
     cp *.png *.wav ${D}/opt/QtPalmtop/pics/korganizer
diff --git a/korganizer/korganizer-embedded_1.7.0.oe b/korganizer/korganizer-embedded_1.7.0.oe
index e69de29bb2..31ee8d9b60 100644
--- a/korganizer/korganizer-embedded_1.7.0.oe
+++ b/korganizer/korganizer-embedded_1.7.0.oe
@@ -0,0 +1,57 @@
+DESCRIPTION= "Korganizer/Pi is a powerful calender and ToDo Tool for Qt/Embedded based Palmtop Environments"
+SECTION = "base"
+PRIORITY = "optional"
+MAINTAINER = "Sebastian Goergen <zeppo@gmx.net>"
+LICENSE = "GPL"
+RDEPENDS = "lipqpe1"
+DEPENDS ="virtual/libc virtual/libqpe"
+PR = "b"
+
+SRC_URI = "http://www.pi-sync.net/daunlood/latest/korganizerPi.170${PR}.tar.gz"
+
+S = "${WORKDIR}/korganizerPi.170${PR}"
+
+inherit palmtop
+
+EXTRA_QMAKEVARS_POST = "QMAKE_UIC=${STAGING_BINDIR}/uic QMAKE_MOC=${STAGING_BINDIR}/moc QMAKE_RPATH=-Wl,-rpath-link,"
+QMAKE_PROFILES= "all.pro"
+
+SUBDIRS="qtcompat microkde libical/src/libical libical/src/libicalss libkcal libkdepim libkabcwrap kalarmd korganizer " 
+
+do_configure_prepend() {
+        echo -e "TEMPLATE=subdirs\nSUBDIRS=${SUBDIRS}\n" >all.pro
+        for d in ${SUBDIRS}
+        do
+                mv -f ${d}/`basename ${d}`E.pro ${d}/`basename ${d}`.pro
+        done
+}
+
+do_install() {
+    install -d ${D}/${palmtopdir}/bin \
+	       ${D}/${palmtopdir}/lib \
+	       ${D}/${palmtopdir}/apps/Pim \
+       	       ${D}/${palmtopdir}/pics/korganizer/icons16 \
+       	       ${D}/${palmtopdir}/pics/korganizer/iconsmini \
+       	       ${D}/${palmtopdir}/plugins/applets
+    install -m 0644 korganizer/korganizer.desktop ${D}/opt/QtPalmtop/apps/Pim/korganizer.desktop
+    cd ${S}/pics
+    cp ko*.png ${D}/opt/QtPalmtop/pics
+    cp *.png *.wav ${D}/opt/QtPalmtop/pics/korganizer
+    cp ./icons16/*.png ${D}/opt/QtPalmtop/pics/korganizer/icons16
+    cp ./iconsmini/*.png ${D}/opt/QtPalmtop/pics/korganizer/iconsmini
+
+    for f in libmicrokde.so.1.0.0 libmicrokdepim.so.1.0.0 libmicrokabc.so.1.0.0 libmicrokcal.so.1.0.0 libmicroqtcompat.so.1.0.0 
+    do
+        oe_soinstall ${STAGING_LIBDIR}/${f} ${D}/opt/QtPalmtop/lib
+        rm -f ${STAGING_LIBDIR}/${f}
+    done
+
+    install -m 0755 ${STAGING_DIR}/target/bin/kopi ${D}/opt/QtPalmtop/bin/kopi
+    rm -f ${STAGING_DIR}/target/bin/kopi
+    for f in libkopialarmapplet.so.1.0.0 libsimplealarmdaemon.so.1.0.0
+    do
+	oe_soinstall ${STAGING_DIR}/target/plugins/applets/${f} ${D}/opt/QtPalmtop/plugins/applets
+    rm -f $ {STAGING_DIR}/target/plugins/applets/${f}
+    done
+
+}