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

into marcinj.local:/home/hrw/zaurus/oe/packages

2004/08/25 18:11:54+02:00 local!hrw
kdepim/pi: added required pictures to applet package

BKrev: 412cba63oQNKvTiT_I3fNzXJ9apfiQ

diff --git a/kdepimpi/kdepimpi_1.9.3a.oe b/kdepimpi/kdepimpi_1.9.3a.oe
index 3c3ae65..1c9a244 100644 (file)
--- a/kdepimpi/kdepimpi_1.9.3a.oe
+++ b/kdepimpi/kdepimpi_1.9.3a.oe
@@ -5,7 +5,7 @@ MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>"
 LICENSE = "GPL"
 DEPENDS ="virtual/libqpe"
 HOMEPAGE = "http://www.pi-sync.net/ http://sf.net/projects/kdepimpi/"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/kdepimpi/kdepim193a.src.tar.gz \
 file://libkcal.pro.patch;patch=1 \
@@ -52,6 +52,8 @@ do_install() {
                ${D}/${palmtopdir}/pics/kdepim/kaddressbook/icons22 \
                ${D}/${palmtopdir}/plugins/applets
 
+    install -m 0644 ${S}/bin/kdepim/korganizer/ko16.png ${D}/${palmtopdir}/pics/
+    install -m 0644 ${S}/bin/kdepim/korganizer/ko24.png ${D}/${palmtopdir}/pics/
     install -m 0644 ${S}/bin/kdepim/korganizer/*.png ${D}/${palmtopdir}/pics/kdepim/korganizer
     install -m 0644 ${S}/bin/kdepim/korganizer/*.wav ${D}/${palmtopdir}/pics/kdepim/korganizer
     install -m 0644 ${S}/bin/kdepim/korganizer/*.txt ${D}/${palmtopdir}/pics/kdepim/korganizer
@@ -83,5 +85,5 @@ PACKAGES = "kopi kapi libmicrokdelibs kopi-applet"
 
 FILES_kopi = "${palmtopdir}/bin/kopi ${palmtopdir}/apps/1Pim/korganizer.desktop ${palmtopdir}/pics/kdepim/korganizer/*"
 FILES_kapi = "${palmtopdir}/bin/kapi ${palmtopdir}/apps/1Pim/kaddressbook.desktop ${palmtopdir}/pics/kdepim/kaddressbook/* ${palmtopdir}/lib/libmicrokabc_*"
-FILES_kopi-applet = "${palmtopdir}/plugins/applets/*"
+FILES_kopi-applet = "${palmtopdir}/plugins/applets/* ${palmtopdir}/pics/ko16.png ${palmtopdir}/pics/ko24.png"
 FILES_libmicrokdelibs = "${palmtopdir}/lib/*"

diff --git a/kdepimpi/kdepimpi_cvs.oe b/kdepimpi/kdepimpi_cvs.oe
index 4bd7e8d..15ae404 100644 (file)
--- a/kdepimpi/kdepimpi_cvs.oe
+++ b/kdepimpi/kdepimpi_cvs.oe
@@ -16,7 +16,7 @@ LICENSE = "GPL"
 DEPENDS = "gammu" # libetpan libmailwrapper" will be needed for KMicroMail/PI
 HOMEPAGE = "http://www.pi-sync.net/ http://sf.net/projects/kdepimpi/"
 PV = "1.9.3a-${CVSDATE}"
-PR = "r5"
+PR = "r6"
 
 DEFAULT_PREFERENCE = "-1"
 
@@ -87,6 +87,8 @@ do_install() {
                ${D}/${palmtopdir}/pics/kdepim/kaddressbook/icons22 \
                ${D}/${palmtopdir}/plugins/applets
 
+    install -m 0644 ${S}/bin/kdepim/korganizer/ko16.png ${D}/${palmtopdir}/pics/
+    install -m 0644 ${S}/bin/kdepim/korganizer/ko24.png ${D}/${palmtopdir}/pics/
     install -m 0644 ${S}/bin/kdepim/korganizer/*.png ${D}/${palmtopdir}/pics/kdepim/korganizer
     install -m 0644 ${S}/bin/kdepim/korganizer/*.wav ${D}/${palmtopdir}/pics/kdepim/korganizer
     install -m 0644 ${S}/bin/kdepim/korganizer/*.txt ${D}/${palmtopdir}/pics/kdepim/korganizer
@@ -119,7 +121,7 @@ libmicrokabc libmicrokcal libmicrokdelibs "
 
 FILES_kopi = "${palmtopdir}/bin/kopi ${palmtopdir}/apps/1Pim/korganizer.desktop ${palmtopdir}/pics/kdepim/korganizer/*"
 FILES_kapi = "${palmtopdir}/bin/kapi ${palmtopdir}/apps/1Pim/kaddressbook.desktop ${palmtopdir}/pics/kdepim/kaddressbook/*"
-FILES_kopi-applet = "${palmtopdir}/plugins/applets/*"
+FILES_kopi-applet = "${palmtopdir}/plugins/applets/* ${palmtopdir}/pics/ko16.png ${palmtopdir}/pics/ko24.png"
 FILES_libmicrokdelibs = "${palmtopdir}/lib/*"
 FILES_libmicrokabc = "${palmtopdir}/lib/libmicrokabc*"
 FILES_libmicrokcal = "${palmtopdir}/lib/libmicrokcal*"