synchronized opie-kdepim-image with last changes to opie-image

diff --git a/packages/meta/opie-image.bb b/packages/meta/opie-image.bb
index f8ae846..b1cf207 100644 (file)
--- a/packages/meta/opie-image.bb
+++ b/packages/meta/opie-image.bb
@@ -6,18 +6,20 @@ FEED_URIS_append_opensimpad = " opie##http://openzaurus.org/official/unstable/${
 FEED_URIS_append_familiar   = " opie##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/opie"
 
 LICENSE = "MIT"
-PR = "r17"
+PR = "r18"
 
 DEPENDS = "meta-opie"
 
 extra_stuff := '${@base_conditional("ROOT_FLASH_SIZE", "16", "", "task-opie-extra-games task-opie-extra-apps task-opie-extra-styles",d)}'
 
-export IPKG_INSTALL = "task-bootstrap task-opie-base task-opie-base-applets \
-                       task-opie-base-inputmethods task-opie-base-apps \
-                       task-opie-base-settings task-opie-base-decorations \
-                       task-opie-base-styles task-opie-base-pim \
-                      task-opie-extra-settings \
-                      ${extra_stuff}"
+INSTALL_PACKAGES = "task-bootstrap task-opie-base task-opie-base-applets \
+                   task-opie-base-inputmethods task-opie-base-apps \
+                   task-opie-base-settings task-opie-base-decorations \
+                   task-opie-base-styles task-opie-base-pim \
+                   task-opie-extra-settings \
+                   ${extra_stuff}"
+
+export IPKG_INSTALL = "${INSTALL_PACKAGES}"
 
 # merge feed-sources into ipkg.conf for opie-aqpkg as it can't handle feed-sources outside of ipkg.conf.
 merge_feeds() {

diff --git a/packages/meta/opie-kdepim-image.bb b/packages/meta/opie-kdepim-image.bb
index 380ba70..1136087 100644 (file)
--- a/packages/meta/opie-kdepim-image.bb
+++ b/packages/meta/opie-kdepim-image.bb
@@ -1,18 +1,10 @@
 include opie-image.bb
 
-export IMAGE_BASENAME = "opie-kdepim-image"
+DEPENDS += "kdepimpi"
+PR = "r1"
 
-#
-# Putting it altogether. Better state IPKG_INSTALL and DEPENDS twice, because library names != package names.
-#
+export IMAGE_BASENAME = "opie-kdepim-image"
 
-export IPKG_INSTALL = "task-bootstrap ${OPIE_LIBS_RDEPENDS} ${OPIE_BASE} ${OPIE_BASE_APPLETS} \
-                       ${OPIE_BASE_SETTINGS} ${OPIE_BASE_APPS} ${OPIE_BASE_RDEPENDS} \
-                       ${KDE_PIM_RDEPENDS} ${OPIE_EXTRA_APPLETS} ${OPIE_EXTRA_SETTINGS} \
-                       ${OPIE_EXTRA_APPS} ${OPIE_BASE_STYLES} ${OPIE_BASE_DECOS} \
-                       ${OPIE_BASE_INPUTMETHODS}"
+INSTALL_PACKAGES += "kopi kapi kammu kopi-applet"
 
-DEPENDS = "task-bootstrap ${OPIE_LIBS_DEPENDS} ${OPIE_BASE} ${OPIE_BASE_APPLETS} \
-            ${OPIE_BASE_SETTINGS}  ${OPIE_BASE_APPS} ${OPIE_BASE_DEPENDS} ${KDE_PIM_DEPENDS} \
-            ${OPIE_EXTRA_APPLETS} ${OPIE_EXTRA_SETTINGS} ${OPIE_EXTRA_APPS} \
-            ${OPIE_BASE_STYLES} ${OPIE_BASE_DECOS} ${OPIE_BASE_INPUTMETHODS}"
+export IPKG_INSTALL = "${INSTALL_PACKAGES}"