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

into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2004/08/29 15:30:18+02:00 uni-frankfurt.de!mickey
opie-i18n: package .directory files

2004/08/29 15:23:01+02:00 uni-frankfurt.de!mickey
fix stupid typo in opie-collections

2004/08/29 14:23:17+02:00 uni-frankfurt.de!mickey
remove locales from the default opie-image. opie uses an own i18n scheme

BKrev: 4131da74iVDnZlpUns_DS1k1zWNkAA

diff --git a/meta/opie-collections.oe b/meta/opie-collections.oe
index 814f9b0..f4d8af3 100644 (file)
--- a/meta/opie-collections.oe
+++ b/meta/opie-collections.oe
@@ -13,10 +13,10 @@ OPIE_BASE = "opie-pics opie-qcop opie-quicklauncher opie-taskbar"
 #
 # High res displays want more fonts
 #
-OPIE_LIBS_RDEPENDS_append_corgi    = "qpf-bitstream-vera-large"
-OPIE_LIBS_RDEPENDS_append_shepherd = "qpf-bitstream-vera-large"
-OPIE_LIBS_RDEPENDS_append_husky    = "qpf-bitstream-vera-large"
-OPIE_LIBS_RDEPENDS_append_tosa     = "qpf-bitstream-vera-large"
+OPIE_LIBS_RDEPENDS_append_corgi    = " qpf-bitstream-vera-large"
+OPIE_LIBS_RDEPENDS_append_shepherd = " qpf-bitstream-vera-large"
+OPIE_LIBS_RDEPENDS_append_husky    = " qpf-bitstream-vera-large"
+OPIE_LIBS_RDEPENDS_append_tosa     = " qpf-bitstream-vera-large"
 
 #
 # Things for reasonable bootstrap image

diff --git a/meta/opie-image.oe b/meta/opie-image.oe
index e8b5d14..4871127 100644 (file)
--- a/meta/opie-image.oe
+++ b/meta/opie-image.oe
@@ -1,4 +1,5 @@
 export IMAGE_BASENAME = "opie-image"
+export IMAGE_LINGUAS = ""
 
 include opie-collections.oe
 

diff --git a/opie-i18n/opie-i18n_cvs.oe b/opie-i18n/opie-i18n_cvs.oe
index c35bf68..d6ec540 100644 (file)
--- a/opie-i18n/opie-i18n_cvs.oe
+++ b/opie-i18n/opie-i18n_cvs.oe
@@ -5,7 +5,7 @@ MAINTAINER = "Team Opie <opie@handhelds.org>
 LICENSE = "GPL"
 DEPENDS = "opie-lrelease-native"
 PV = "1.1.5-cvs-${CVSDATE}"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/i18n \
           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/etc/dict"
@@ -29,6 +29,7 @@ do_install() {
        do
                echo Installing language $f
                install -d ${D}${palmtopdir}/i18n/$f/
+               install -m 0644 $f/.directory ${D}${palmtopdir}/i18n/$f/
                install -m 0644 $f/*.qm ${D}${palmtopdir}/i18n/$f/
                if [ -e ${WORKDIR}/dict/dawg.$f ]
                then