Merge the conflict

2004/11/13 21:06:11+01:00 handhelds.org!zecke
Opie 1.1.7:
	Remove CVSDATE and PR from the package files

2004/11/13 20:52:18+01:00 handhelds.org!zecke
Update packaging of 1.1.7 to match the 'cvs' version of the Opie versions

2004/11/13 20:36:08+01:00 handhelds.org!zecke
Upgrade all Opie 1.1.6 files to Opie 1.1.7 in preparation
of the next OpenZaurus/Familiar release.

Remove all occurrences of Opie1.1.6 in the files

BKrev: 41966a744AeMTtlPuskXFPg512ykqQ

4 files changed, 0 insertions, 69 deletions

diff --git a/opie-i18n/opie-i18n_1.1.6.oe b/opie-i18n/opie-i18n_1.1.6.oe
deleted file mode 100644
index c879bf0e17..0000000000
--- a/opie-i18n/opie-i18n_1.1.6.oe
+++ /dev/null
@@ -1,69 +0,0 @@
-DESCRIPTION = "Opie i18n files"
-SECTION = "opie/base"
-PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>
-LICENSE = "GPL"
-DEPENDS = "opie-lrelease-native"
-
-PR = "r3"
-CVSDATE = "20041003"
-
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/i18n \
-	   cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/etc/dict"
-S = "${WORKDIR}/i18n"
-
-do_compile() {
-	for f in ?? ??_??
-	do
-		cd ${S}/$f
-		for g in *.ts
-		do
-			opie-lrelease $g
-		done
-	done
-}
-
-do_install() {
-	install -d ${D}${palmtopdir}/i18n/
-	install -d ${D}${palmtopdir}/etc/dict/
-	for f in ?? ??_??
-	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
-			install -m 0644 ${WORKDIR}/dict/dawg.$f ${D}${palmtopdir}/etc/dict/
-		fi
-	done
-}
-
-PACKAGES = "	opie-i18n-cz  opie-i18n-da  opie-i18n-de  opie-i18n-dk  opie-i18n-en  opie-i18n-es  opie-i18n-fr  opie-i18n-hu \
-		opie-i18n-it  opie-i18n-ja  opie-i18n-ko  opie-i18n-lv  opie-i18n-mk  opie-i18n-nl  opie-i18n-no  opie-i18n-pl \
-		opie-i18n-pt  opie-i18n-pt-br  opie-i18n-ru  opie-i18n-sl  opie-i18n-xx  opie-i18n-zh-cn  opie-i18n-zh-tw "
-
-FILES_opie-i18n-cz = "${palmtopdir}/i18n/cz ${palmtopdir}/etc/dict/dawg.cz"
-FILES_opie-i18n-da = "${palmtopdir}/i18n/da ${palmtopdir}/etc/dict/dawg.da"
-FILES_opie-i18n-de = "${palmtopdir}/i18n/de ${palmtopdir}/etc/dict/dawg.de"
-FILES_opie-i18n-dk = "${palmtopdir}/i18n/dk ${palmtopdir}/etc/dict/dawg.dk"
-FILES_opie-i18n-en = "${palmtopdir}/i18n/en ${palmtopdir}/etc/dict/dawg.en"
-FILES_opie-i18n-es = "${palmtopdir}/i18n/es ${palmtopdir}/etc/dict/dawg.es"
-FILES_opie-i18n-fr = "${palmtopdir}/i18n/fr ${palmtopdir}/etc/dict/dawg.fr"
-FILES_opie-i18n-hu = "${palmtopdir}/i18n/hu ${palmtopdir}/etc/dict/dawg.hu"
-FILES_opie-i18n-it = "${palmtopdir}/i18n/it ${palmtopdir}/etc/dict/dawg.it"
-FILES_opie-i18n-ja = "${palmtopdir}/i18n/ja ${palmtopdir}/etc/dict/dawg.ja"
-FILES_opie-i18n-ko = "${palmtopdir}/i18n/ko ${palmtopdir}/etc/dict/dawg.ko"
-FILES_opie-i18n-lv = "${palmtopdir}/i18n/lv ${palmtopdir}/etc/dict/dawg.lv"
-FILES_opie-i18n-mk = "${palmtopdir}/i18n/mk ${palmtopdir}/etc/dict/dawg.mk"
-FILES_opie-i18n-nl = "${palmtopdir}/i18n/nl ${palmtopdir}/etc/dict/dawg.nl"
-FILES_opie-i18n-no = "${palmtopdir}/i18n/no ${palmtopdir}/etc/dict/dawg.no"
-FILES_opie-i18n-pl = "${palmtopdir}/i18n/pl ${palmtopdir}/etc/dict/dawg.pl"
-FILES_opie-i18n-pt = "${palmtopdir}/i18n/pt ${palmtopdir}/etc/dict/dawg.pt"
-FILES_opie-i18n-pt-br = "${palmtopdir}/i18n/pt_BR ${palmtopdir}/etc/dict/dawg.pt_BR"
-FILES_opie-i18n-ru = "${palmtopdir}/i18n/ru ${palmtopdir}/etc/dict/dawg.ru"
-FILES_opie-i18n-sl = "${palmtopdir}/i18n/sl ${palmtopdir}/etc/dict/dawg.sl"
-FILES_opie-i18n-xx = "${palmtopdir}/i18n/xx ${palmtopdir}/etc/dict/dawg.xx"
-FILES_opie-i18n-zh-cn = "${palmtopdir}/i18n/zh_CN ${palmtopdir}/etc/dict/dawg.zh_CN"
-FILES_opie-i18n-zh-tw = "${palmtopdir}/i18n/zh_TW ${palmtopdir}/etc/dict/dawg.zh_TW"
-
diff --git a/opie-i18n/opie-lrelease-native_1.1.6.oe b/opie-i18n/opie-i18n_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-i18n/opie-lrelease-native_1.1.6.oe
+++ b/opie-i18n/opie-i18n_1.1.7.oe
diff --git a/opie-i18n/opie-lupdate-native_1.1.6.oe b/opie-i18n/opie-lrelease-native_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-i18n/opie-lupdate-native_1.1.6.oe
+++ b/opie-i18n/opie-lrelease-native_1.1.7.oe
diff --git a/opie-i18n/opie-lupdate-native_1.1.7.oe b/opie-i18n/opie-lupdate-native_1.1.7.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/opie-i18n/opie-lupdate-native_1.1.7.oe