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

211 files changed, 0 insertions, 1267 deletions

diff --git a/libmailwrapper/libmailwrapper_1.1.6.oe b/libmailwrapper/libmailwrapper_1.1.6.oe
deleted file mode 100644
index dfca18dd30..0000000000
--- a/libmailwrapper/libmailwrapper_1.1.6.oe
+++ /dev/null
@@ -1,28 +0,0 @@
-DESCRIPTION = "Qt-based class wrapper of libetpan."
-SECTION = "opie/libs"
-PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
-LICENSE = "LGPL"
-DEPENDS = "libetpan"
-PR = "r3"
-
-#TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
-TAG="v1_1_6_b"
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/noncore/net/mail/libmailwrapper "
-S = "${WORKDIR}/libmailwrapper"
-
-inherit opie
-
-do_stage () {
-	install -d ${STAGING_INCDIR}/libmailwrapper/
-	install -m 0664 ${S}/maildefines.h ${STAGING_INCDIR}/libmailwrapper/
-	install -m 0664 ${S}/settings.h ${STAGING_INCDIR}/libmailwrapper/
-	install -m 0664 ${S}/statusmail.h ${STAGING_INCDIR}/libmailwrapper/
-	install -m 0664 ${S}/abstractmail.h ${STAGING_INCDIR}/libmailwrapper/
-	install -m 0664 ${S}/mailtypes.h ${STAGING_INCDIR}/libmailwrapper/
-	oe_libinstall -so libmailwrapper ${STAGING_LIBDIR}
-}
-
-do_install() {
-	oe_libinstall -so libmailwrapper ${D}/${palmtopdir}/lib
-}
diff --git a/opie-aboutapplet/opie-aboutapplet_1.1.6.oe b/libmailwrapper/libmailwrapper_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-aboutapplet/opie-aboutapplet_1.1.6.oe
+++ b/libmailwrapper/libmailwrapper_1.1.7.oe
diff --git a/libopie/libopie2_1.1.6.oe b/libopie/libopie2_1.1.6.oe
deleted file mode 100644
index 4ab814cb3a..0000000000
--- a/libopie/libopie2_1.1.6.oe
+++ /dev/null
@@ -1,79 +0,0 @@
-DESCRIPTION = "Base libraries for the Open Palmtop Integrated Environment"
-HOMEPAGE = "http://opie.handhelds.org"
-SECTION = "opie/libs"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
-LICENSE = "LGPL"
-I18N_FILES = "libopiecore2.ts libopiesecurity2.ts"
-DEPENDS = "libqpe-opie sqlite libpcap-0.7.2 virtual/kernel"
-PROVIDES = "libopiecore2 libopiedb2 libopiemm2 libopiesecurity2 libopienet2 libopiepim2 libopieui2 "
-PR = "r1"
-
-TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/libopie2 \
-           file://include.pro"
-S = "${WORKDIR}/libopie2"
-
-inherit opie
-
-CVSDATE = "20041015"
-
-#FIXME: Add machine specific bits here. Best use oe_machinstall and read from a given file
-
-EXTRA_QMAKEVARS_POST = 'DEFINES+=OPIE_NEW_MALLOC \
-                        DEFINES+="OPIE_SOUND_FRAGMENT_SHIFT=16" \
-			DEFINES+=OPIE_NO_ERASE_RECT_HACKFIX \
-			LIBS+=-L${S} LIBS+="-Wl,-rpath-link,${S}"'
-
-EXTRA_QMAKEVARS_PRE = 'ENABLE_SQL_PIM_BACKEND=y'
-
-# uclibc doesn't have backtrace()
-python __anonymous () {
-    import oe, re
-    if (re.match('.*uclibc$', oe.data.getVar('TARGET_OS', d, 1)) != None):
-        oe.data.setVar("EXTRA_QMAKEVARS_POST_append", " DEFINES+=OPIE_NO_BACKTRACE ", d)
-}
-
-do_compile() {
-	install -d ${STAGING_INCDIR}/opie2
-	install -d ${STAGING_INCDIR}/opie2/private
-	for i in `find . -name "*.h"`
-	do
-		install -m 0644 $i ${STAGING_INCDIR}/opie2/`basename $i`
-	done
-	install -m 0644 opiepim/private/vobject_p.h ${STAGING_INCDIR}/opie2/private/	
-	oe_runmake MOC=${STAGING_BINDIR}/moc UIC=${STAGING_BINDIR}/uic DESTDIR=${S}
-}
-
-LIBS = "core2 ui2 db2 mm2 net2 pim2 security2"
-
-# need some special case for uic-created header files here
-do_stage() {
-        for f in ${LIBS}
-	do
-		oe_libinstall -so libopie$f ${STAGING_LIBDIR}/
-	done
-
-	install -m 0644 ${WORKDIR}/include.pro ${OPIEDIR}/
-	install -m 0644 opiepim/ui/opimrecurrencebase.h ${STAGING_INCDIR}/opie2/
-	install -m 0644 opieui/otimepickerbase.h ${STAGING_INCDIR}/opie2/
-	install -m 0644 opiepim/core/opimtemplatebase.h ${STAGING_INCDIR}/opie2/
-}
-
-do_install() {
-	install -d ${D}/${palmtopdir}/lib
-	for f in ${LIBS}
-	do
-		oe_libinstall -so libopie$f ${D}/${palmtopdir}/lib
-	done
-}
-
-PACKAGES = "libopiecore2 libopiedb2 libopiesecurity2 libopiemm2 libopienet2 libopiepim2 libopieui2"
-FILES_libopiecore2 = "${palmtopdir}/lib/libopiecore2.so*"
-FILES_libopiedb2 = "${palmtopdir}/lib/libopiedb2.so*"
-FILES_libopiemm2 = "${palmtopdir}/lib/libopiemm2.so*"
-FILES_libopienet2 = "${palmtopdir}/lib/libopienet2.so*"
-FILES_libopiepim2 = "${palmtopdir}/lib/libopiepim2.so*"
-FILES_libopieui2 = "${palmtopdir}/lib/libopieui2.so*"
-FILES_libopiesecurity2 = "${palmtopdir}/lib/libopiesecurity2.so*"
-
-#FIXME: Add individual package descriptions and dependencies
diff --git a/opie-addressbook/opie-addressbook_1.1.6.oe b/libopie/libopie2_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-addressbook/opie-addressbook_1.1.6.oe
+++ b/libopie/libopie2_1.1.7.oe
diff --git a/libopieobex/libopieobex0_1.1.6.oe b/libopieobex/libopieobex0_1.1.6.oe
deleted file mode 100644
index dd8c915b7c..0000000000
--- a/libopieobex/libopieobex0_1.1.6.oe
+++ /dev/null
@@ -1,23 +0,0 @@
-DESCRIPTION = "IrDA obex support library"
-SECTION = "opie/libs"
-PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
-LICENSE = "LGPL"
-DEPENDS = "opie-taskbar"
-RDEPENDS = "openobex-apps"
-APPNAME = "obex"
-
-TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/core/obex \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/pics"
-S = "${WORKDIR}/obex"
-
-inherit opie
-
-do_install() {
-        install -d ${D}${palmtopdir}/pics/${APPNAME}/ ${D}${palmtopdir}/plugins/obex/
-        install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
-	oe_libinstall -so libopieobex ${D}${palmtopdir}/plugins/obex/
-}
-
-FILES_${PN} = "${palmtopdir}/plugins/obex/ ${palmtopdir}/pics/obex/"
diff --git a/opie-alarm/opie-alarm_1.1.6.oe b/libopieobex/libopieobex0_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-alarm/opie-alarm_1.1.6.oe
+++ b/libopieobex/libopieobex0_1.1.7.oe
diff --git a/libopietooth/libopietooth1_1.1.6.oe b/libopietooth/libopietooth1_1.1.6.oe
deleted file mode 100644
index 3636fa33ed..0000000000
--- a/libopietooth/libopietooth1_1.1.6.oe
+++ /dev/null
@@ -1,26 +0,0 @@
-DESCRIPTION = "Opie Bluetooth library"
-SECTION = "opie/libs"
-PRIORITY = "optional"
-DEPENDS = "libopie2"
-MAINTAINER = "Team Opie <opie@handhelds.org>
-LICENSE = "LGPL"
-PR = "r2"
-
-CVSDATE = "20041015"
-
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/noncore/net/opietooth/lib"
-
-inherit opie
-
-TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
-S = "${WORKDIR}/lib"
-
-do_stage() {
-        install -m 0644 *.h ${STAGING_INCDIR}/
-	oe_libinstall -so libopietooth1 ${STAGING_LIBDIR}/
-}
- 
-do_install() {
-	oe_libinstall -so libopietooth1 ${D}/${palmtopdir}/lib
-}
-
diff --git a/opie-appearance/opie-appearance_1.1.6.oe b/libopietooth/libopietooth1_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-appearance/opie-appearance_1.1.6.oe
+++ b/libopietooth/libopietooth1_1.1.7.oe
diff --git a/libqpe/libqpe-opie_1.1.6.oe b/libqpe/libqpe-opie_1.1.6.oe
deleted file mode 100644
index d3c62245d1..0000000000
--- a/libqpe/libqpe-opie_1.1.6.oe
+++ /dev/null
@@ -1,53 +0,0 @@
-DESCRIPTION = "Base library for the Qt Palmtop Environment"
-SECTION = "opie/libs"
-PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
-LICENSE = "GPL"
-DEPENDS = "uicmoc-native qte-for-opie"
-PROVIDES = "virtual/libqpe"
-
-TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/library"
-S = "${WORKDIR}/library"
-
-inherit qmake
-
-QMAKE_PROFILES = "library.pro"
-EXTRA_QMAKEVARS_PRE  = "CONFIG+=LIBQPE_WITHROHFEEDBACK"
-EXTRA_QMAKEVARS_POST = "DESTDIR="
-
-CXXFLAGS_append = " -DQWS -DOPIE_NO_ERASE_RECT_HACKFIX -DOPIE_NEW_MALLOC  -fno-rtti -fno-exceptions"
-
-do_compile() {
-        mkdir -p ${STAGING_INCDIR}/qpe \
-                 ${STAGING_INCDIR}/qtopia \
-                 ${STAGING_INCDIR}/opie \
-                 ${STAGING_INCDIR}/opie2 \
-                 ${STAGING_INCDIR}/qtopia/private
-	for i in ${S}/*.h
-	do
-		install -m 0644 $i ${STAGING_INCDIR}/qpe/`basename $i`
-		install -m 0644 $i ${STAGING_INCDIR}/qtopia/`basename $i`
-		install -m 0644 $i ${STAGING_INCDIR}/qtopia/private/`basename $i`
-	done
-	for i in ${S}/backend/*.h
-	do
-		install -m 0644 $i ${STAGING_INCDIR}/qpe/`basename $i`
-		install -m 0644 $i ${STAGING_INCDIR}/qtopia/`basename $i`
-		install -m 0644 $i ${STAGING_INCDIR}/qtopia/private/`basename $i`
-	done
-	rm -f ${STAGING_INCDIR}/qtopia/*_p.h # remove private stuff out of qtopia
-	oe_runmake MOC=${STAGING_BINDIR}/moc UIC=${STAGING_BINDIR}/uic
-}
-
-do_stage() {
-	oe_libinstall -so libqpe ${STAGING_LIBDIR}
-	# include files already done during do_compile
-}
-
-do_install() {
-	oe_libinstall -so libqpe ${D}/${palmtopdir}/lib
-}
-
-PACKAGES = "libqpe1"
-FILES_libqpe1 = "${palmtopdir}/lib"
diff --git a/opie-aqpkg/opie-aqpkg_1.1.6.oe b/libqpe/libqpe-opie_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-aqpkg/opie-aqpkg_1.1.6.oe
+++ b/libqpe/libqpe-opie_1.1.7.oe
diff --git a/opie-autorotateapplet/opie-autorotateapplet_1.1.6.oe b/opie-aboutapplet/opie-aboutapplet_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-autorotateapplet/opie-autorotateapplet_1.1.6.oe
+++ b/opie-aboutapplet/opie-aboutapplet_1.1.7.oe
diff --git a/opie-backgammon/opie-backgammon_1.1.6.oe b/opie-addressbook/opie-addressbook_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-backgammon/opie-backgammon_1.1.6.oe
+++ b/opie-addressbook/opie-addressbook_1.1.7.oe
diff --git a/opie-advancedfm/opie-advancedfm_1.1.6.oe b/opie-advancedfm/opie-advancedfm_1.1.6.oe
deleted file mode 100644
index 1e1e300418..0000000000
--- a/opie-advancedfm/opie-advancedfm_1.1.6.oe
+++ /dev/null
@@ -1,25 +0,0 @@
-DESCRIPTION = "Opie Advanced Filemanager"
-SECTION = "opie/applications"
-PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
-LICENSE = "GPL"
-APPNAME = "advancedfm"
-RDEPENDS = "opie-advancedfm-pics"
-PR = "r1"
-
-TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/noncore/apps/${APPNAME} \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/apps"
-S = "${WORKDIR}/${APPNAME}"
-
-inherit opie
-
-do_install() {
-    install -d ${D}/${palmtopdir}/pics/${APPNAME}/
-    install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}/${palmtopdir}/pics/${APPNAME}/
-}
-
-PACKAGES_prepend = "opie-advancedfm-pics "
-FILES_opie-advancedfm-pics = "${palmtopdir}/pics/${APPNAME}/*.png"
-
diff --git a/opie-backup/opie-backup_1.1.6.oe b/opie-advancedfm/opie-advancedfm_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-backup/opie-backup_1.1.6.oe
+++ b/opie-advancedfm/opie-advancedfm_1.1.7.oe
diff --git a/opie-batteryapplet/opie-batteryapplet_1.1.6.oe b/opie-alarm/opie-alarm_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-batteryapplet/opie-batteryapplet_1.1.6.oe
+++ b/opie-alarm/opie-alarm_1.1.7.oe
diff --git a/opie-bluepin/opie-bluepin_1.1.6.oe b/opie-appearance/opie-appearance_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-bluepin/opie-bluepin_1.1.6.oe
+++ b/opie-appearance/opie-appearance_1.1.7.oe
diff --git a/opie-bluetoothapplet/opie-bluetoothapplet_1.1.6.oe b/opie-aqpkg/opie-aqpkg_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-bluetoothapplet/opie-bluetoothapplet_1.1.6.oe
+++ b/opie-aqpkg/opie-aqpkg_1.1.7.oe
diff --git a/opie-bluetoothmanager/opie-bluetoothmanager_1.1.6.oe b/opie-autorotateapplet/opie-autorotateapplet_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-bluetoothmanager/opie-bluetoothmanager_1.1.6.oe
+++ b/opie-autorotateapplet/opie-autorotateapplet_1.1.7.oe
diff --git a/opie-bounce/opie-bounce_1.1.6.oe b/opie-backgammon/opie-backgammon_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-bounce/opie-bounce_1.1.6.oe
+++ b/opie-backgammon/opie-backgammon_1.1.7.oe
diff --git a/opie-brightnessapplet/opie-brightnessapplet_1.1.6.oe b/opie-backup/opie-backup_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-brightnessapplet/opie-brightnessapplet_1.1.6.oe
+++ b/opie-backup/opie-backup_1.1.7.oe
diff --git a/opie-bartender/opie-bartender_1.1.6.oe b/opie-bartender/opie-bartender_1.1.6.oe
deleted file mode 100644
index 57772b0047..0000000000
--- a/opie-bartender/opie-bartender_1.1.6.oe
+++ /dev/null
@@ -1,26 +0,0 @@
-DESCRIPTION = "Bartender drink receipe database"
-SECTION = "opie/applications"
-PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
-LICENSE = "GPL"
-
-APPNAME = "bartender"
-APPTYPE = "binary"
-
-CVSDATE = "20041015"
-
-TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/noncore/apps/opie-bartender \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/apps"
-
-S = "${WORKDIR}/opie-bartender"
-
-inherit opie
-
-do_install() {
-        install -d ${D}${palmtopdir}/pics/${APPNAME}/
-        install -d ${D}${palmtopdir}/etc/${APPNAME}/
-	install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
-	install -m 0644 db/drinkdb.txt  ${D}${palmtopdir}/etc/${APPNAME}/
-}
diff --git a/opie-button-settings/opie-button-settings_1.1.6.oe b/opie-bartender/opie-bartender_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-button-settings/opie-button-settings_1.1.6.oe
+++ b/opie-bartender/opie-bartender_1.1.7.oe
diff --git a/opie-buzzword/opie-buzzword_1.1.6.oe b/opie-batteryapplet/opie-batteryapplet_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-buzzword/opie-buzzword_1.1.6.oe
+++ b/opie-batteryapplet/opie-batteryapplet_1.1.7.oe
diff --git a/opie-calculator/opie-calculator_1.1.6.oe b/opie-bluepin/opie-bluepin_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-calculator/opie-calculator_1.1.6.oe
+++ b/opie-bluepin/opie-bluepin_1.1.7.oe
diff --git a/opie-calibrate/opie-calibrate_1.1.6.oe b/opie-bluetoothapplet/opie-bluetoothapplet_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-calibrate/opie-calibrate_1.1.6.oe
+++ b/opie-bluetoothapplet/opie-bluetoothapplet_1.1.7.oe
diff --git a/opie-citytime/opie-citytime_1.1.6.oe b/opie-bluetoothmanager/opie-bluetoothmanager_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-citytime/opie-citytime_1.1.6.oe
+++ b/opie-bluetoothmanager/opie-bluetoothmanager_1.1.7.oe
diff --git a/opie-clipboardapplet/opie-clipboardapplet_1.1.6.oe b/opie-bounce/opie-bounce_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-clipboardapplet/opie-clipboardapplet_1.1.6.oe
+++ b/opie-bounce/opie-bounce_1.1.7.oe
diff --git a/opie-clock/opie-clock_1.1.6.oe b/opie-brightnessapplet/opie-brightnessapplet_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-clock/opie-clock_1.1.6.oe
+++ b/opie-brightnessapplet/opie-brightnessapplet_1.1.7.oe
diff --git a/opie-clockapplet/opie-clockapplet_1.1.6.oe b/opie-button-settings/opie-button-settings_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-clockapplet/opie-clockapplet_1.1.6.oe
+++ b/opie-button-settings/opie-button-settings_1.1.7.oe
diff --git a/opie-confeditor/opie-confeditor_1.1.6.oe b/opie-buzzword/opie-buzzword_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-confeditor/opie-confeditor_1.1.6.oe
+++ b/opie-buzzword/opie-buzzword_1.1.7.oe
diff --git a/opie-dasher/opie-dasher_1.1.6.oe b/opie-calculator/opie-calculator_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-dasher/opie-dasher_1.1.6.oe
+++ b/opie-calculator/opie-calculator_1.1.7.oe
diff --git a/opie-datebook/opie-datebook_1.1.6.oe b/opie-calibrate/opie-calibrate_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-datebook/opie-datebook_1.1.6.oe
+++ b/opie-calibrate/opie-calibrate_1.1.7.oe
diff --git a/opie-cardmon/opie-cardmon_1.1.6.oe b/opie-cardmon/opie-cardmon_1.1.6.oe
deleted file mode 100644
index 8ee09e5335..0000000000
--- a/opie-cardmon/opie-cardmon_1.1.6.oe
+++ /dev/null
@@ -1,41 +0,0 @@
-DESCRIPTION = "CF/PCMCIA Card Monitor applet"
-SECTION = "opie/applets"
-PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
-LICENSE = "GPL"
-
-I18N_FILES = "libcardmonapplet.ts"
-APPNAME = "cardmonapplet"
-
-TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/core/applets/cardmon \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/sounds \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/apps"
-
-S = "${WORKDIR}/cardmon"
-
-inherit opie
-
-pkg_postinst() {
-#!/bin/sh
-if pidof -s qpe >/dev/null; then
-  /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
-fi
- if [ -n "$D" ]; then false; fi
-}
-
-pkg_postrm() {
-#!/bin/sh
-/opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
- if [ -n "$D" ]; then false; fi
-}
-
-# FILES plugins/applets/libcardmonapplet.so* pics/cardmon/*.png sounds/cardmon/*.wav
-do_install() {
-        install -d ${D}${palmtopdir}/pics/cardmon/
-        install -d ${D}${palmtopdir}/sounds/cardmon/
-        install -m 0644 ${WORKDIR}/pics/cardmon/*.png ${D}${palmtopdir}/pics/cardmon/
-        install -m 0644 ${WORKDIR}/sounds/cardmon/*.wav ${D}${palmtopdir}/sounds/cardmon/
-}
-
diff --git a/opie-deco-flat/opie-deco-flat_1.1.6.oe b/opie-cardmon/opie-cardmon_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-deco-flat/opie-deco-flat_1.1.6.oe
+++ b/opie-cardmon/opie-cardmon_1.1.7.oe
diff --git a/opie-deco-liquid/opie-deco-liquid_1.1.6.oe b/opie-citytime/opie-citytime_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-deco-liquid/opie-deco-liquid_1.1.6.oe
+++ b/opie-citytime/opie-citytime_1.1.7.oe
diff --git a/opie-deco-polished/opie-deco-polished_1.1.6.oe b/opie-clipboardapplet/opie-clipboardapplet_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-deco-polished/opie-deco-polished_1.1.6.oe
+++ b/opie-clipboardapplet/opie-clipboardapplet_1.1.7.oe
diff --git a/opie-doctab/opie-doctab_1.1.6.oe b/opie-clock/opie-clock_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-doctab/opie-doctab_1.1.6.oe
+++ b/opie-clock/opie-clock_1.1.7.oe
diff --git a/opie-drawpad/opie-drawpad_1.1.6.oe b/opie-clockapplet/opie-clockapplet_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-drawpad/opie-drawpad_1.1.6.oe
+++ b/opie-clockapplet/opie-clockapplet_1.1.7.oe
diff --git a/opie-dvorak/opie-dvorak_1.1.6.oe b/opie-confeditor/opie-confeditor_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-dvorak/opie-dvorak_1.1.6.oe
+++ b/opie-confeditor/opie-confeditor_1.1.7.oe
diff --git a/opie-console/opie-console_1.1.6.oe b/opie-console/opie-console_1.1.6.oe
deleted file mode 100644
index 967a38fb2d..0000000000
--- a/opie-console/opie-console_1.1.6.oe
+++ /dev/null
@@ -1,24 +0,0 @@
-DESCRIPTION = "Opie Console"
-SECTION = "opie/applications"
-PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
-LICENSE = "GPL"
-RDEPENDS = "opie-keytabs qte-font-fixed"
-PR = "r2"
-
-APPNAME = "opie-console"
-APPTYPE = binary
-
-TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/noncore/apps/${APPNAME} \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/apps"
-S = "${WORKDIR}/${APPNAME}"
-
-inherit opie
-
-do_install() {
-    install -d ${D}/${palmtopdir}/pics/console/keys/
-    install -m 0644 ${WORKDIR}/pics/console/*.png ${D}/${palmtopdir}/pics/console/
-    install -m 0644 ${WORKDIR}/pics/console/keys/*.png ${D}/${palmtopdir}/pics/console/keys/
-}
diff --git a/opie-euroconv/opie-euroconv_1.1.6.oe b/opie-console/opie-console_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-euroconv/opie-euroconv_1.1.6.oe
+++ b/opie-console/opie-console_1.1.7.oe
diff --git a/opie-dagger/opie-dagger_1.1.6.oe b/opie-dagger/opie-dagger_1.1.6.oe
deleted file mode 100644
index bde9809c4f..0000000000
--- a/opie-dagger/opie-dagger_1.1.6.oe
+++ /dev/null
@@ -1,26 +0,0 @@
-DESCRIPTION = "A Bible study program utilizing the Sword library."
-SECTION = "opie/applications"
-PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
-LICENSE = "GPL"
-DEPENDS = "libopiecore2 libopieui2 sword"
-APPNAME = "dagger"
-PR = "r2"
-
-CVSDATE = "20041015"
-
-EXTRA_QMAKEVARS_PRE = "LIBSWORD_INC_DIR=${STAGING_INCDIR}/sword"
-
-TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/noncore/apps/dagger \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/apps"
-S = "${WORKDIR}/${APPNAME}"
-
-inherit opie
-
-do_install() {
-        install -d ${D}${palmtopdir}/pics/${APPNAME}/
-        install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
-}
-
diff --git a/opie-examples-python/opie-examples-python_1.1.6.oe b/opie-dagger/opie-dagger_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-examples-python/opie-examples-python_1.1.6.oe
+++ b/opie-dagger/opie-dagger_1.1.7.oe
diff --git a/opie-fifteen/opie-fifteen_1.1.6.oe b/opie-dasher/opie-dasher_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-fifteen/opie-fifteen_1.1.6.oe
+++ b/opie-dasher/opie-dasher_1.1.7.oe
diff --git a/opie-formatter/opie-formatter_1.1.6.oe b/opie-datebook/opie-datebook_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-formatter/opie-formatter_1.1.6.oe
+++ b/opie-datebook/opie-datebook_1.1.7.oe
diff --git a/opie-freetype/opie-freetype_1.1.6.oe b/opie-deco-flat/opie-deco-flat_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-freetype/opie-freetype_1.1.6.oe
+++ b/opie-deco-flat/opie-deco-flat_1.1.7.oe
diff --git a/opie-go/opie-go_1.1.6.oe b/opie-deco-liquid/opie-deco-liquid_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-go/opie-go_1.1.6.oe
+++ b/opie-deco-liquid/opie-deco-liquid_1.1.7.oe
diff --git a/opie-handwriting/opie-handwriting_1.1.6.oe b/opie-deco-polished/opie-deco-polished_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-handwriting/opie-handwriting_1.1.6.oe
+++ b/opie-deco-polished/opie-deco-polished_1.1.7.oe
diff --git a/opie-helpbrowser/opie-helpbrowser_1.1.6.oe b/opie-doctab/opie-doctab_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-helpbrowser/opie-helpbrowser_1.1.6.oe
+++ b/opie-doctab/opie-doctab_1.1.7.oe
diff --git a/opie-homeapplet/opie-homeapplet_1.1.6.oe b/opie-drawpad/opie-drawpad_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-homeapplet/opie-homeapplet_1.1.6.oe
+++ b/opie-drawpad/opie-drawpad_1.1.7.oe
diff --git a/opie-i18n/opie-lrelease-native_1.1.6.oe b/opie-dvorak/opie-dvorak_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-i18n/opie-lrelease-native_1.1.6.oe
+++ b/opie-dvorak/opie-dvorak_1.1.7.oe
diff --git a/opie-embeddedkonsole/opie-embeddedkonsole_1.1.6.oe b/opie-embeddedkonsole/opie-embeddedkonsole_1.1.6.oe
deleted file mode 100644
index 9b9abfebb4..0000000000
--- a/opie-embeddedkonsole/opie-embeddedkonsole_1.1.6.oe
+++ /dev/null
@@ -1,23 +0,0 @@
-DESCRIPTION = "Opie embedded konsole"
-SECTION = "opie/applications"
-PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
-LICENSE = "GPL"
-DEPENDS = " libqtaux2"
-RDEPENDS = "qte-font-fixed"
-PR = "r1"
-
-APPNAME = "embeddedkonsole"
-
-TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/core/apps/${APPNAME} \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/apps"
-S = "${WORKDIR}/${APPNAME}"
-
-inherit opie
-
-do_install() {
-    install -d ${D}/${palmtopdir}/pics/konsole/
-    install -m 0644 ${WORKDIR}/pics/konsole/*.png ${D}/${palmtopdir}/pics/konsole/
-}
diff --git a/opie-i18n/opie-lupdate-native_1.1.6.oe b/opie-embeddedkonsole/opie-embeddedkonsole_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-i18n/opie-lupdate-native_1.1.6.oe
+++ b/opie-embeddedkonsole/opie-embeddedkonsole_1.1.7.oe
diff --git a/opie-irdaapplet/opie-irdaapplet_1.1.6.oe b/opie-euroconv/opie-euroconv_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-irdaapplet/opie-irdaapplet_1.1.6.oe
+++ b/opie-euroconv/opie-euroconv_1.1.7.oe
diff --git a/opie-jumpx/opie-jumpx_1.1.6.oe b/opie-examples-python/opie-examples-python_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-jumpx/opie-jumpx_1.1.6.oe
+++ b/opie-examples-python/opie-examples-python_1.1.7.oe
diff --git a/opie-eye/opie-eye_1.1.6.oe b/opie-eye/opie-eye_1.1.6.oe
deleted file mode 100644
index 26e41a1c67..0000000000
--- a/opie-eye/opie-eye_1.1.6.oe
+++ /dev/null
@@ -1,32 +0,0 @@
-DESCRIPTION = "A image viewer"
-SECTION = "opie/applications"
-PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
-LICENSE = "GPL"
-DEPENDS = "libopiecore2 libopieui2 libopiemm2"
-RDEPENDS = "opie-advancedfm-pics"
-APPNAME = "opie-eye"
-PR = "r2"
-
-TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/noncore/graphics/opie-eye \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/apps"
-S = "${WORKDIR}/${APPNAME}"
-
-inherit opie
-
-do_configure_append() {
-        cd slave && qmake -makefile -spec ${QMAKESPEC} slave.pro -after ${EXTRA_QMAKEVARS_POST}
-}
-
-do_compile_append() {
-        cd slave && oe_runmake
-}
-
-do_install() {
-	install -m 0755 opie-eye_slave ${D}/${palmtopdir}/bin/
-        install -d ${D}${palmtopdir}/pics/${APPNAME}/
-        install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
-}
-
diff --git a/opie-kbill/opie-kbill_1.1.6.oe b/opie-eye/opie-eye_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-kbill/opie-kbill_1.1.6.oe
+++ b/opie-eye/opie-eye_1.1.7.oe
diff --git a/opie-kcheckers/opie-kcheckers_1.1.6.oe b/opie-fifteen/opie-fifteen_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-kcheckers/opie-kcheckers_1.1.6.oe
+++ b/opie-fifteen/opie-fifteen_1.1.7.oe
diff --git a/opie-keyboard/opie-keyboard_1.1.6.oe b/opie-formatter/opie-formatter_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-keyboard/opie-keyboard_1.1.6.oe
+++ b/opie-formatter/opie-formatter_1.1.7.oe
diff --git a/opie-keypebble/opie-keypebble_1.1.6.oe b/opie-freetype/opie-freetype_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-keypebble/opie-keypebble_1.1.6.oe
+++ b/opie-freetype/opie-freetype_1.1.7.oe
diff --git a/opie-ftp/opie-ftp_1.1.6.oe b/opie-ftp/opie-ftp_1.1.6.oe
deleted file mode 100644
index 70bfd54bde..0000000000
--- a/opie-ftp/opie-ftp_1.1.6.oe
+++ /dev/null
@@ -1,26 +0,0 @@
-DESCRIPTION = "Opie-Ftp"
-SECTION = "opie/applications"
-PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
-LICENSE = "GPL"
-DEPENDS = "libopiecore2 opie-ftplib"
-I18N_FILES = "opieftp.ts"
-
-APPNAME = "opieftp"
-APPTYPE = "binary"
-
-TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/noncore/net/opieftp \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/apps"
-
-S = "${WORKDIR}/${APPNAME}"
-
-inherit opie
-
-# FILES plugins/application/libopieftp.so* bin/opieftp pics/opieftp apps/Applications/opieftp.desktop
-do_install() {
-        install -d ${D}${palmtopdir}/pics/${APPNAME}/
-        install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
-}
-
diff --git a/opie-keytabs/opie-keytabs_1.1.6.oe b/opie-ftp/opie-ftp_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-keytabs/opie-keytabs_1.1.6.oe
+++ b/opie-ftp/opie-ftp_1.1.7.oe
diff --git a/opie-ftplib/opie-ftplib_1.1.6.oe b/opie-ftplib/opie-ftplib_1.1.6.oe
deleted file mode 100644
index 72ace97d7b..0000000000
--- a/opie-ftplib/opie-ftplib_1.1.6.oe
+++ /dev/null
@@ -1,27 +0,0 @@
-DESCRIPTION = "Opie FTP Library"
-SECTION = "opie/libs"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
-PRIORITY = "optional"
-LICENSE = "GPL"
-PROVIDES = "libftplib1"
-I18N_FILES = "libftplib.ts"
-
-PR = "r1"
-
-TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/noncore/net/ftplib"
-S = "${WORKDIR}/ftplib"
-
-inherit palmtop
-inherit opie_i18n
-
-EXTRA_QMAKEVARS_POST = "DESTDIR=${S}"
-
-do_stage () {
-	install -m 0664 ${S}/ftplib.h ${STAGING_INCDIR}/
-	oe_libinstall -so libftplib ${STAGING_LIBDIR}
-}
-
-do_install() {
-	oe_libinstall -so libftplib ${D}/${palmtopdir}/lib
-}
diff --git a/opie-keyview/opie-keyview_1.1.6.oe b/opie-ftplib/opie-ftplib_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-keyview/opie-keyview_1.1.6.oe
+++ b/opie-ftplib/opie-ftplib_1.1.7.oe
diff --git a/opie-kjumpx/opie-kjumpx_1.1.6.oe b/opie-go/opie-go_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-kjumpx/opie-kjumpx_1.1.6.oe
+++ b/opie-go/opie-go_1.1.7.oe
diff --git a/opie-gutenbrowser/opie-gutenbrowser_1.1.6.oe b/opie-gutenbrowser/opie-gutenbrowser_1.1.6.oe
deleted file mode 100644
index d38886b80f..0000000000
--- a/opie-gutenbrowser/opie-gutenbrowser_1.1.6.oe
+++ /dev/null
@@ -1,27 +0,0 @@
-DESCRIPTION = "Etext reader for the Project Gutenberg."
-SECTION = "opie/applications"
-PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
-LICENSE = "GPL"
-DEPENDS = "  opie-ftplib"
-
-APPNAME = "gutenbrowser"
-
-CVSDATE = "20041015"
-
-TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/noncore/apps/opie-gutenbrowser \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/apps \
-	   cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/etc"
-
-S = "${WORKDIR}/opie-gutenbrowser"
-
-inherit opie
-
-do_install() {
-        install -d ${D}${palmtopdir}/pics/${APPNAME}/
-        install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
-	install -d ${D}${palmtopdir}/etc/gutenbrowser/
-	install -m 0644 ${WORKDIR}/etc/gutenbrowser/ftpList ${WORKDIR}/etc/gutenbrowser/GUTINDEX.ALL ${D}${palmtopdir}/etc/gutenbrowser/
-}
diff --git a/opie-kpacman/opie-kpacman_1.1.6.oe b/opie-gutenbrowser/opie-gutenbrowser_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-kpacman/opie-kpacman_1.1.6.oe
+++ b/opie-gutenbrowser/opie-gutenbrowser_1.1.7.oe
diff --git a/opie-language/opie-language_1.1.6.oe b/opie-handwriting/opie-handwriting_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-language/opie-language_1.1.6.oe
+++ b/opie-handwriting/opie-handwriting_1.1.7.oe
diff --git a/opie-help-en/opie-help-en_1.1.6.oe b/opie-help-en/opie-help-en_1.1.6.oe
deleted file mode 100644
index 069d3ac38a..0000000000
--- a/opie-help-en/opie-help-en_1.1.6.oe
+++ /dev/null
@@ -1,25 +0,0 @@
-DESCRIPTION = "Opie Help Packages - English"
-SECTION = "opie/help"
-PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
-LICENSE = "GPL"
-
-TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/help/en/html "
-S = "${WORKDIR}/html"
-
-do_install() {
-        install -d ${D}${palmtopdir}/help/en/html/
-        install -m 0644 ${WORKDIR}/html/*.html ${D}${palmtopdir}/help/en/html/
-	for d in $(find . -type d | grep -v CVS)
-	do
-		install -d ${D}${palmtopdir}/help/en/html/$d
-        	install -m 0644 ${WORKDIR}/html/$d/*.html ${D}${palmtopdir}/help/en/html/$d/
-	done
-}
-
-python populate_packages_prepend () {
-	help_dir = oe.data.expand('${palmtopdir}/help/en/html/', d)
-	
-	do_split_packages(d, help_dir, file_regex='^(.*)\.html$', output_pattern='opie-%s-help-en', description='Opie Help for %s - English', aux_files_pattern=help_dir + '%s/*')
-}
diff --git a/opie-launcher-settings/opie-launcher-settings_1.1.6.oe b/opie-help-en/opie-help-en_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-launcher-settings/opie-launcher-settings_1.1.6.oe
+++ b/opie-help-en/opie-help-en_1.1.7.oe
diff --git a/opie-light-and-power/opie-light-and-power_1.1.6.oe b/opie-helpbrowser/opie-helpbrowser_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-light-and-power/opie-light-and-power_1.1.6.oe
+++ b/opie-helpbrowser/opie-helpbrowser_1.1.7.oe
diff --git a/opie-login/opie-login_1.1.6.oe b/opie-homeapplet/opie-homeapplet_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-login/opie-login_1.1.6.oe
+++ b/opie-homeapplet/opie-homeapplet_1.1.7.oe
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-logoutapplet/opie-logoutapplet_1.1.6.oe b/opie-i18n/opie-i18n_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-logoutapplet/opie-logoutapplet_1.1.6.oe
+++ b/opie-i18n/opie-i18n_1.1.7.oe
diff --git a/opie-mailapplet/opie-mailapplet_1.1.6.oe b/opie-i18n/opie-lrelease-native_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-mailapplet/opie-mailapplet_1.1.6.oe
+++ b/opie-i18n/opie-lrelease-native_1.1.7.oe
diff --git a/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_1.1.6.oe b/opie-i18n/opie-lupdate-native_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_1.1.6.oe
+++ b/opie-i18n/opie-lupdate-native_1.1.7.oe
diff --git a/opie-irc/opie-irc_1.1.6.oe b/opie-irc/opie-irc_1.1.6.oe
deleted file mode 100644
index cbedd1e827..0000000000
--- a/opie-irc/opie-irc_1.1.6.oe
+++ /dev/null
@@ -1,29 +0,0 @@
-DESCRIPTION = "The Opie IRC client lets you chat on your favorite IRC server using your handheld computer"
-SECTION = "opie/applications"
-PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
-LICENSE = "GPL"
-I18N_FILES = "opieirc.ts"
-DEPENDS = "libqtaux2"
-
-APPNAME = "opieirc"
-#APPTYPE = "binary"
-
-TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/noncore/net/opieirc \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/help \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/apps \
-	   cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/pics"
-
-S = "${WORKDIR}/${APPNAME}"
-
-inherit opie
-
-# FILES plugins/application/libopieirc.so* bin/opieirc pics/opieirc apps/Applications/opieirc.desktop help/en/html/opieirc.html help/en/html/opieirc
-do_install() {
-	install -d ${D}${palmtopdir}/pics/${APPNAME}/
-	install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
-        install -d ${D}${palmtopdir}/help/en/html/
-        install -m 0644 ${WORKDIR}/help/en/html/opieirc.html ${D}${palmtopdir}/help/en/html/
-}
-
diff --git a/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_1.1.6.oe b/opie-irc/opie-irc_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_1.1.6.oe
+++ b/opie-irc/opie-irc_1.1.7.oe
diff --git a/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_1.1.6.oe b/opie-irdaapplet/opie-irdaapplet_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_1.1.6.oe
+++ b/opie-irdaapplet/opie-irdaapplet_1.1.7.oe
diff --git a/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_1.1.6.oe b/opie-jumpx/opie-jumpx_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_1.1.6.oe
+++ b/opie-jumpx/opie-jumpx_1.1.7.oe
diff --git a/opie-mediaplayer1/opie-mediaplayer1_1.1.6.oe b/opie-kbill/opie-kbill_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-mediaplayer1/opie-mediaplayer1_1.1.6.oe
+++ b/opie-kbill/opie-kbill_1.1.7.oe
diff --git a/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_1.1.6.oe b/opie-kcheckers/opie-kcheckers_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_1.1.6.oe
+++ b/opie-kcheckers/opie-kcheckers_1.1.7.oe
diff --git a/opie-mediaplayer2/opie-mediaplayer2-skin-default_1.1.6.oe b/opie-keyboard/opie-keyboard_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-mediaplayer2/opie-mediaplayer2-skin-default_1.1.6.oe
+++ b/opie-keyboard/opie-keyboard_1.1.7.oe
diff --git a/opie-mediaplayer2/opie-mediaplayer2-skin-pod_1.1.6.oe b/opie-keypebble/opie-keypebble_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-mediaplayer2/opie-mediaplayer2-skin-pod_1.1.6.oe
+++ b/opie-keypebble/opie-keypebble_1.1.7.oe
diff --git a/opie-mediaplayer2/opie-mediaplayer2-skin-techno_1.1.6.oe b/opie-keytabs/opie-keytabs_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-mediaplayer2/opie-mediaplayer2-skin-techno_1.1.6.oe
+++ b/opie-keytabs/opie-keytabs_1.1.7.oe
diff --git a/opie-mediummount/opie-mediummount_1.1.6.oe b/opie-keyview/opie-keyview_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-mediummount/opie-mediummount_1.1.6.oe
+++ b/opie-keyview/opie-keyview_1.1.7.oe
diff --git a/opie-memoryapplet/opie-memoryapplet_1.1.6.oe b/opie-kjumpx/opie-kjumpx_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-memoryapplet/opie-memoryapplet_1.1.6.oe
+++ b/opie-kjumpx/opie-kjumpx_1.1.7.oe
diff --git a/opie-mindbreaker/opie-mindbreaker_1.1.6.oe b/opie-kpacman/opie-kpacman_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-mindbreaker/opie-mindbreaker_1.1.6.oe
+++ b/opie-kpacman/opie-kpacman_1.1.7.oe
diff --git a/opie-minesweep/opie-minesweep_1.1.6.oe b/opie-language/opie-language_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-minesweep/opie-minesweep_1.1.6.oe
+++ b/opie-language/opie-language_1.1.7.oe
diff --git a/opie-multikey/opie-multikey_1.1.6.oe b/opie-launcher-settings/opie-launcher-settings_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-multikey/opie-multikey_1.1.6.oe
+++ b/opie-launcher-settings/opie-launcher-settings_1.1.7.oe
diff --git a/opie-libqrsync/opie-libqrsync_1.1.6.oe b/opie-libqrsync/opie-libqrsync_1.1.6.oe
deleted file mode 100644
index 3ffea23aec..0000000000
--- a/opie-libqrsync/opie-libqrsync_1.1.6.oe
+++ /dev/null
@@ -1,18 +0,0 @@
-DESCRIPTION = "Qt wrapper for librsync"
-SECTION = "opie/base"
-PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
-LICENSE = "GPL"
-
-CVSDATE = "20041015"
-
-TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/rsync"
-S = "${WORKDIR}/rsync"
-
-inherit opie
-
-do_stage() {
-	oe_libinstall -a libqrsync ${STAGING_LIBDIR}/
-	install -m 0644 qrsync.h ${STAGING_INCDIR}/
-}
diff --git a/opie-multikeyapplet/opie-multikeyapplet_1.1.6.oe b/opie-libqrsync/opie-libqrsync_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-multikeyapplet/opie-multikeyapplet_1.1.6.oe
+++ b/opie-libqrsync/opie-libqrsync_1.1.7.oe
diff --git a/opie-networkapplet/opie-networkapplet_1.1.6.oe b/opie-light-and-power/opie-light-and-power_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-networkapplet/opie-networkapplet_1.1.6.oe
+++ b/opie-light-and-power/opie-light-and-power_1.1.7.oe
diff --git a/opie-notesapplet/opie-notesapplet_1.1.6.oe b/opie-login/opie-login_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-notesapplet/opie-notesapplet_1.1.6.oe
+++ b/opie-login/opie-login_1.1.7.oe
diff --git a/opie-odict/opie-odict_1.1.6.oe b/opie-logoutapplet/opie-logoutapplet_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-odict/opie-odict_1.1.6.oe
+++ b/opie-logoutapplet/opie-logoutapplet_1.1.7.oe
diff --git a/opie-mail/opie-mail_1.1.6.oe b/opie-mail/opie-mail_1.1.6.oe
deleted file mode 100644
index c2c2c52803..0000000000
--- a/opie-mail/opie-mail_1.1.6.oe
+++ /dev/null
@@ -1,28 +0,0 @@
-DESCRIPTION = "Opie's mail and news client featuring POP3, IMAP and NNTP - with and without SSL."
-SECTION = "opie/pim"
-PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
-LICENSE = "GPL"
-DEPENDS = "libmailwrapper libetpan"
-RDEPENDS = "opie-pics"
-PR = "r2"
-
-APPNAME = "opiemail"
-
-TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
-STAG = v1_1_6_b
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${STAG};module=opie/noncore/net/mail \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/apps \
-	   cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/pics"
-
-S = "${WORKDIR}/mail"
-
-inherit opie
-
-# FILES plugins/application/libopiemail.so* bin/opiemail apps/1Pim/mail.desktop pics/mail/*.png
-
-do_install() {
-	install -d ${D}/${palmtopdir}/pics/mail/
-	install -m 0644 ${WORKDIR}/pics/mail/*.png ${D}/${palmtopdir}/pics/mail/
-}
-
diff --git a/opie-oyatzee/opie-oyatzee_1.1.6.oe b/opie-mail/opie-mail_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-oyatzee/opie-oyatzee_1.1.6.oe
+++ b/opie-mail/opie-mail_1.1.7.oe
diff --git a/opie-packagemanager/opie-packagemanager_1.1.6.oe b/opie-mailapplet/opie-mailapplet_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-packagemanager/opie-packagemanager_1.1.6.oe
+++ b/opie-mailapplet/opie-mailapplet_1.1.7.oe
diff --git a/opie-parashoot/opie-parashoot_1.1.6.oe b/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-parashoot/opie-parashoot_1.1.6.oe
+++ b/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_1.1.7.oe
diff --git a/opie-performance/opie-performance_1.1.6.oe b/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-performance/opie-performance_1.1.6.oe
+++ b/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_1.1.7.oe
diff --git a/opie-pickboard/opie-pickboard_1.1.6.oe b/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-pickboard/opie-pickboard_1.1.6.oe
+++ b/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_1.1.7.oe
diff --git a/opie-powerchord/opie-powerchord_1.1.6.oe b/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-powerchord/opie-powerchord_1.1.6.oe
+++ b/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_1.1.7.oe
diff --git a/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_1.1.6.oe b/opie-mediaplayer1/opie-mediaplayer1_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_1.1.6.oe
+++ b/opie-mediaplayer1/opie-mediaplayer1_1.1.7.oe
diff --git a/opie-qasteroids/opie-qasteroids_1.1.6.oe b/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-qasteroids/opie-qasteroids_1.1.6.oe
+++ b/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_1.1.7.oe
diff --git a/opie-quicklauncher/opie-quicklauncher_1.1.6.oe b/opie-mediaplayer2/opie-mediaplayer2-skin-default_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-quicklauncher/opie-quicklauncher_1.1.6.oe
+++ b/opie-mediaplayer2/opie-mediaplayer2-skin-default_1.1.7.oe
diff --git a/opie-reader/opie-reader_1.1.6.oe b/opie-mediaplayer2/opie-mediaplayer2-skin-pod_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-reader/opie-reader_1.1.6.oe
+++ b/opie-mediaplayer2/opie-mediaplayer2-skin-pod_1.1.7.oe
diff --git a/opie-recorder/opie-recorder_1.1.6.oe b/opie-mediaplayer2/opie-mediaplayer2-skin-techno_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-recorder/opie-recorder_1.1.6.oe
+++ b/opie-mediaplayer2/opie-mediaplayer2-skin-techno_1.1.7.oe
diff --git a/opie-mediaplayer2/opie-mediaplayer2_1.1.6.oe b/opie-mediaplayer2/opie-mediaplayer2_1.1.6.oe
deleted file mode 100644
index 4ac478bb39..0000000000
--- a/opie-mediaplayer2/opie-mediaplayer2_1.1.6.oe
+++ /dev/null
@@ -1,27 +0,0 @@
-DESCRIPTION = "The mediaplayer for Opie. It plays mp3, mpeg, wav, ogg, quicktime, divx and more. Also it is streaming capable."
-SECTION = "opie/multimedia"
-PRIORITY = "optional"
-LICENSE = "GPL"
-MAINTAINER = "Team Opie <opie@handhelds.org>
-DEPENDS = "libxine-1.0.0-beta12"
-RDEPENDS = "opie-mediaplayer2-skin"
-APPNAME = "opieplayer2"
-PR = "r1"
-
-TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/noncore/multimedia/opieplayer2 \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/apps \
-	   file://fix-switch-yuv2rgb_arm2.patch;patch=1"
-S = "${WORKDIR}/${APPNAME}"
-
-inherit opie
-
-QMAKE_PROFILES = "opieplayer2.pro"
-
-do_install() {
-	install -d ${D}${palmtopdir}/pics/${APPNAME}/ ${S}${palmtopdir}/apps/Applications/
-        install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
-	install -m 0644 ${WORKDIR}/apps/Applications/mediaplayer.desktop ${D}${palmtopdir}/apps/Applications/
-}
-
diff --git a/opie-remote/opie-remote_1.1.6.oe b/opie-mediaplayer2/opie-mediaplayer2_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-remote/opie-remote_1.1.6.oe
+++ b/opie-mediaplayer2/opie-mediaplayer2_1.1.7.oe
diff --git a/opie-restartapplet/opie-restartapplet2_1.1.6.oe b/opie-mediummount/opie-mediummount_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-restartapplet/opie-restartapplet2_1.1.6.oe
+++ b/opie-mediummount/opie-mediummount_1.1.7.oe
diff --git a/opie-restartapplet/opie-restartapplet_1.1.6.oe b/opie-memoryapplet/opie-memoryapplet_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-restartapplet/opie-restartapplet_1.1.6.oe
+++ b/opie-memoryapplet/opie-memoryapplet_1.1.7.oe
diff --git a/opie-rotateapplet/opie-rotateapplet_1.1.6.oe b/opie-mindbreaker/opie-mindbreaker_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-rotateapplet/opie-rotateapplet_1.1.6.oe
+++ b/opie-mindbreaker/opie-mindbreaker_1.1.7.oe
diff --git a/opie-screenshotapplet/opie-screenshotapplet_1.1.6.oe b/opie-minesweep/opie-minesweep_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-screenshotapplet/opie-screenshotapplet_1.1.6.oe
+++ b/opie-minesweep/opie-minesweep_1.1.7.oe
diff --git a/opie-mobilemsg/opie-mobilemsg_1.1.6.oe b/opie-mobilemsg/opie-mobilemsg_1.1.6.oe
deleted file mode 100644
index 2ddace6d32..0000000000
--- a/opie-mobilemsg/opie-mobilemsg_1.1.6.oe
+++ /dev/null
@@ -1,30 +0,0 @@
-DESCRIPTION = "Mobile Messaging"
-SECTION = "opie/applications"
-PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
-LICENSE = "GPL"
-
-APPNAME = "mobilemsg"
-APPTYPE = "binary"
-
-PR = "r1"
-CVSDATE = "20040925"
-
-TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/noncore/comm/mobilemsg \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/apps"
-
-S = "${WORKDIR}/${APPNAME}"
-
-inherit opie
-
-# FILES plugins/application/libmobilemsg.so* bin/mobilemsg apps/Applications/mobilemsg.desktop pics/mobilemsg
-
-do_install() {
-}
-
-do_install_prepend() {
-	install -d ${D}${palmtopdir}/pics/mobilemsg/
-	install -m 0644 ${WORKDIR}/pics/mobilemsg/*.png ${D}${palmtopdir}/pics/mobilemsg/
-}
diff --git a/opie-search/opie-search_1.1.6.oe b/opie-mobilemsg/opie-mobilemsg_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-search/opie-search_1.1.6.oe
+++ b/opie-mobilemsg/opie-mobilemsg_1.1.7.oe
diff --git a/opie-security/opie-security_1.1.6.oe b/opie-multikey/opie-multikey_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-security/opie-security_1.1.6.oe
+++ b/opie-multikey/opie-multikey_1.1.7.oe
diff --git a/opie-sfcave/opie-sfcave_1.1.6.oe b/opie-multikeyapplet/opie-multikeyapplet_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-sfcave/opie-sfcave_1.1.6.oe
+++ b/opie-multikeyapplet/opie-multikeyapplet_1.1.7.oe
diff --git a/opie-sh/opie-sh_1.1.6.oe b/opie-networkapplet/opie-networkapplet_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-sh/opie-sh_1.1.6.oe
+++ b/opie-networkapplet/opie-networkapplet_1.1.7.oe
diff --git a/opie-networksettings/opie-networksettings_1.1.6.oe b/opie-networksettings/opie-networksettings_1.1.6.oe
deleted file mode 100644
index 0f75085e97..0000000000
--- a/opie-networksettings/opie-networksettings_1.1.6.oe
+++ /dev/null
@@ -1,37 +0,0 @@
-DESCRIPTION = "Opie Network Settings"
-SECTION = "opie/settings"
-PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
-LICENSE = "GPL"
-PROVIDES = "opie-networksettings-pppplugin opie-networksettings-wlanplugin"
-APPNAME = "networksettings"
-
-TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/noncore/settings/networksettings \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/apps"
-
-S = "${WORKDIR}/${APPNAME}"
-
-inherit opie
-
-EXTRA_QMAKEVARS_POST += "LIBS+=-L${S}"
-
-do_install() {
-	install -d ${D}/${palmtopdir}/pics/${APPNAME}/
-	install -d ${D}/${palmtopdir}/pics/Network/
-	install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.* ${D}${palmtopdir}/pics/${APPNAME}/
-	install -m 0644 ${WORKDIR}/pics/Network/*.* ${D}${palmtopdir}/pics/Network/
-	install -d ${D}/${palmtopdir}/lib/
-	oe_libinstall -so libinterfaces ${D}${palmtopdir}/lib
-	install -d ${D}/${palmtopdir}/plugins/networksettings/
-	for plugin in kppp wlan
-	do
-		install lib$plugin.so ${D}/${palmtopdir}/plugins/networksettings/
-	done
-}
-
-PACKAGES =+ "opie-networksettings-pppplugin opie-networksettings-wlanplugin"
-FILES_opie-networksettings-pppplugin = "${palmtopdir}/plugins/networksettings/libkppp.so"
-FILES_opie-networksettings-wlanplugin = "${palmtopdir}/plugins/networksettings/libwlan.so"
-
diff --git a/opie-sheet/opie-sheet_1.1.6.oe b/opie-networksettings/opie-networksettings_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-sheet/opie-sheet_1.1.6.oe
+++ b/opie-networksettings/opie-networksettings_1.1.7.oe
diff --git a/opie-showimg/opie-showimg_1.1.6.oe b/opie-notesapplet/opie-notesapplet_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-showimg/opie-showimg_1.1.6.oe
+++ b/opie-notesapplet/opie-notesapplet_1.1.7.oe
diff --git a/opie-snake/opie-snake_1.1.6.oe b/opie-odict/opie-odict_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-snake/opie-snake_1.1.6.oe
+++ b/opie-odict/opie-odict_1.1.7.oe
diff --git a/opie-solitaire/opie-solitaire_1.1.6.oe b/opie-oyatzee/opie-oyatzee_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-solitaire/opie-solitaire_1.1.6.oe
+++ b/opie-oyatzee/opie-oyatzee_1.1.7.oe
diff --git a/opie-sounds/opie-sounds_1.1.6.oe b/opie-packagemanager/opie-packagemanager_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-sounds/opie-sounds_1.1.6.oe
+++ b/opie-packagemanager/opie-packagemanager_1.1.7.oe
diff --git a/opie-sshkeys/opie-sshkeys_1.1.6.oe b/opie-parashoot/opie-parashoot_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-sshkeys/opie-sshkeys_1.1.6.oe
+++ b/opie-parashoot/opie-parashoot_1.1.7.oe
diff --git a/opie-style-flat/opie-style-flat_1.1.6.oe b/opie-performance/opie-performance_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-style-flat/opie-style-flat_1.1.6.oe
+++ b/opie-performance/opie-performance_1.1.7.oe
diff --git a/opie-style-fresh/opie-style-fresh_1.1.6.oe b/opie-pickboard/opie-pickboard_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-style-fresh/opie-style-fresh_1.1.6.oe
+++ b/opie-pickboard/opie-pickboard_1.1.7.oe
diff --git a/opie-pics/opie-pics_1.1.6.oe b/opie-pics/opie-pics_1.1.6.oe
deleted file mode 100644
index 54576a836d..0000000000
--- a/opie-pics/opie-pics_1.1.6.oe
+++ /dev/null
@@ -1,23 +0,0 @@
-DESCRIPTION = "Common Opie pictures usable from all applications"
-SECTION = "opie/base"
-PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>
-LICENSE = "GPL"
-PR = "r0"
-
-TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics;tag=${TAG}"
-S = "${WORKDIR}/pics"
-
-do_install() {
-	install -d ${D}${palmtopdir}/pics/addressbook/
-	install -d ${D}${palmtopdir}/pics/datebook/
-	install -d ${D}${palmtopdir}/pics/todo/
-	install *.png ${D}${palmtopdir}/pics/
-	install addressbook/*.png ${D}${palmtopdir}/pics/addressbook/
-	install datebook/*.png ${D}${palmtopdir}/pics/datebook/
-	install todo/*.png ${D}${palmtopdir}/pics/todo/	
-	
-}
-
-FILES_${PN} = "${palmtopdir}"
diff --git a/opie-style-liquid/opie-style-liquid_1.1.6.oe b/opie-pics/opie-pics_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-style-liquid/opie-style-liquid_1.1.6.oe
+++ b/opie-pics/opie-pics_1.1.7.oe
diff --git a/opie-pimconverter/opie-pimconverter_1.1.6.oe b/opie-pimconverter/opie-pimconverter_1.1.6.oe
deleted file mode 100644
index 99d2ab94df..0000000000
--- a/opie-pimconverter/opie-pimconverter_1.1.6.oe
+++ /dev/null
@@ -1,30 +0,0 @@
-DESCRIPTION = "Opie PIM database converter"
-SECTION = "opie/pim"
-PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
-LICENSE = "GPL"
-DEPENDS = "sqlite"
-
-APPNAME = "opimconverter"
-APPTYPE = "binary"
-
-CVSDATE = "20041011"
-
-PR = "r1"
-
-TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/noncore/tools/pimconverter \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/apps"
-
-S = "${WORKDIR}/pimconverter"
-EXTRA_QMAKEVARS_POST += "TARGET=${APPNAME}"
-
-inherit opie
-
-# FILES bin/opimconverter pics/opimconverter/* apps/1Pim/opimconverter.desktop
-do_install() {
-        install -d ${D}${palmtopdir}/pics/${APPNAME}/
-        install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
-}
-
diff --git a/opie-style-metal/opie-style-metal_1.1.6.oe b/opie-pimconverter/opie-pimconverter_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-style-metal/opie-style-metal_1.1.6.oe
+++ b/opie-pimconverter/opie-pimconverter_1.1.7.oe
diff --git a/opie-style-phase/opie-style-phase_1.1.6.oe b/opie-powerchord/opie-powerchord_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-style-phase/opie-style-phase_1.1.6.oe
+++ b/opie-powerchord/opie-powerchord_1.1.7.oe
diff --git a/opie-style-web/opie-style-web_1.1.6.oe b/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-style-web/opie-style-web_1.1.6.oe
+++ b/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_1.1.7.oe
diff --git a/opie-suspendapplet/opie-suspendapplet_1.1.6.oe b/opie-qasteroids/opie-qasteroids_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-suspendapplet/opie-suspendapplet_1.1.6.oe
+++ b/opie-qasteroids/opie-qasteroids_1.1.7.oe
diff --git a/opie-symlinker/opie-symlinker_1.1.6.oe b/opie-quicklauncher/opie-quicklauncher_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-symlinker/opie-symlinker_1.1.6.oe
+++ b/opie-quicklauncher/opie-quicklauncher_1.1.7.oe
diff --git a/opie-rdesktop/opie-rdesktop_1.1.6.oe b/opie-rdesktop/opie-rdesktop_1.1.6.oe
deleted file mode 100644
index 4fcad249c9..0000000000
--- a/opie-rdesktop/opie-rdesktop_1.1.6.oe
+++ /dev/null
@@ -1,27 +0,0 @@
-DESCRIPTION = "Remote Desktop Protocol (RDP) Client"
-SECTION = "opie/applications"
-PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
-LICENSE = "GPL"
-I18N_FILES = "ordesktop.ts"
-DEPENDS = "openssl"
-
-APPNAME = "ordesktop"
-APPTYPE = "binary"
-
-PR = "r1"
-
-TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/noncore/net/opierdesktop \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/apps \
-	   cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/pics"
-
-S = "${WORKDIR}/opierdesktop"
-
-inherit opie
-
-# FILES bin/ordesktop pics/opierdesktop apps/Applications/opierdesktop.desktop
-do_install() {
-        install -d ${D}${palmtopdir}/pics/opierdesktop/
-        install -m 0644 ${WORKDIR}/pics/opierdesktop/*.png ${D}${palmtopdir}/pics/opierdesktop/ 
-}
diff --git a/opie-sysinfo/opie-sysinfo_1.1.6.oe b/opie-rdesktop/opie-rdesktop_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-sysinfo/opie-sysinfo_1.1.6.oe
+++ b/opie-rdesktop/opie-rdesktop_1.1.7.oe
diff --git a/opie-tableviewer/opie-tableviewer_1.1.6.oe b/opie-reader/opie-reader_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-tableviewer/opie-tableviewer_1.1.6.oe
+++ b/opie-reader/opie-reader_1.1.7.oe
diff --git a/opie-tabmanager/opie-tabmanager_1.1.6.oe b/opie-recorder/opie-recorder_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-tabmanager/opie-tabmanager_1.1.6.oe
+++ b/opie-recorder/opie-recorder_1.1.7.oe
diff --git a/opie-tetrix/opie-tetrix_1.1.6.oe b/opie-remote/opie-remote_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-tetrix/opie-tetrix_1.1.6.oe
+++ b/opie-remote/opie-remote_1.1.7.oe
diff --git a/opie-textedit/opie-textedit_1.1.6.oe b/opie-restartapplet/opie-restartapplet2_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-textedit/opie-textedit_1.1.6.oe
+++ b/opie-restartapplet/opie-restartapplet2_1.1.7.oe
diff --git a/opie-theme/opie-theme_1.1.6.oe b/opie-restartapplet/opie-restartapplet_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-theme/opie-theme_1.1.6.oe
+++ b/opie-restartapplet/opie-restartapplet_1.1.7.oe
diff --git a/opie-restartapplet2/opie-restartapplet2_1.1.6.oe b/opie-restartapplet2/opie-restartapplet2_1.1.6.oe
deleted file mode 100644
index 49f3e6d6ab..0000000000
--- a/opie-restartapplet2/opie-restartapplet2_1.1.6.oe
+++ /dev/null
@@ -1,23 +0,0 @@
-DESCRIPTION = "Restart Applet"
-SECTION = "opie/applets"
-PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
-LICENSE = "GPL"
-
-APPNAME = "restartapplet"
-I18N_FILES = "librestartapplet.ts"
-
-PR = "r1"
-
-TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/core/applets/restartapplet2 \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/apps"
-
-S = "${WORKDIR}/restartapplet2"
-
-inherit opie
-
-# FILES plugins/applets/librestartapplet.so*
-do_install() {
-}
-
diff --git a/opie-tictac/opie-tictac_1.1.6.oe b/opie-restartapplet2/opie-restartapplet2_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-tictac/opie-tictac_1.1.6.oe
+++ b/opie-restartapplet2/opie-restartapplet2_1.1.7.oe
diff --git a/opie-tinykate/opie-tinykate_1.1.6.oe b/opie-rotateapplet/opie-rotateapplet_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-tinykate/opie-tinykate_1.1.6.oe
+++ b/opie-rotateapplet/opie-rotateapplet_1.1.7.oe
diff --git a/opie-today-addressbookplugin/opie-today-addressbookplugin_1.1.6.oe b/opie-screenshotapplet/opie-screenshotapplet_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-today-addressbookplugin/opie-today-addressbookplugin_1.1.6.oe
+++ b/opie-screenshotapplet/opie-screenshotapplet_1.1.7.oe
diff --git a/opie-today-datebookplugin/opie-today-datebookplugin_1.1.6.oe b/opie-search/opie-search_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-today-datebookplugin/opie-today-datebookplugin_1.1.6.oe
+++ b/opie-search/opie-search_1.1.7.oe
diff --git a/opie-today-fortuneplugin/opie-today-fortuneplugin_1.1.6.oe b/opie-security/opie-security_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-today-fortuneplugin/opie-today-fortuneplugin_1.1.6.oe
+++ b/opie-security/opie-security_1.1.7.oe
diff --git a/opie-securityplugins/opie-securityplugin-blueping_1.1.6.oe b/opie-securityplugins/opie-securityplugin-blueping_1.1.6.oe
deleted file mode 100644
index 1ae44834b5..0000000000
--- a/opie-securityplugins/opie-securityplugin-blueping_1.1.6.oe
+++ /dev/null
@@ -1,27 +0,0 @@
-DESCRIPTION = "Blueping plugin for opie-security authentication. \
-This is a bluetooth-based authentication plugin (you need \
-to have another Bluetooth device around to use it)."
-SECTION = "opie/settings"
-PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
-LICENSE = "GPL"
-I18N_FILES = "libmultiauthbluepingplugin.ts"
-RDEPENDS = "opie-security bluez-utils"
-PR = "r1"
-
-APPNAME = "multiauthbluepingplugin"
-
-TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/noncore/securityplugins/blueping \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/pics "
-
-S = "${WORKDIR}/blueping"
-
-inherit opie
-
-# FILES plugins/security/libmultiauthbluepingplugin.so* pics/security/bluepingplugin.png root/etc/suspend-scripts/S50bluetooth
-do_install() {
-        install -d ${D}${palmtopdir}/pics/security/
-        install -m 0644 ${WORKDIR}/pics/security/bluepingplugin.png ${D}${palmtopdir}/pics/security/
-}
-
diff --git a/opie-today-mailplugin/opie-today-mailplugin_1.1.6.oe b/opie-securityplugins/opie-securityplugin-blueping_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-today-mailplugin/opie-today-mailplugin_1.1.6.oe
+++ b/opie-securityplugins/opie-securityplugin-blueping_1.1.7.oe
diff --git a/opie-securityplugins/opie-securityplugin-dummy_1.1.6.oe b/opie-securityplugins/opie-securityplugin-dummy_1.1.6.oe
deleted file mode 100644
index 3d69929ab6..0000000000
--- a/opie-securityplugins/opie-securityplugin-dummy_1.1.6.oe
+++ /dev/null
@@ -1,27 +0,0 @@
-DESCRIPTION = "Dummy plugin for opie-security authentication. \
-This is a very simple authentication plugin (you just have \
-to press a button basically), for demonstration purpose."
-SECTION = "opie/settings"
-PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
-LICENSE = "GPL"
-I18N_FILES = "libmultiauthdummyplugin.ts"
-RDEPENDS = "opie-security"
-PR = "r1"
-
-APPNAME = "multiauthdummyplugin"
-
-TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/noncore/securityplugins/dummy \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/pics "
-
-S = "${WORKDIR}/dummy"
-
-inherit opie
-
-# FILES plugins/security/libmultiauthdummyplugin.so* pics/security/dummyplugin.png
-do_install() {
-        install -d ${D}${palmtopdir}/pics/security
-        install -m 0644 ${WORKDIR}/pics/security/dummyplugin.png ${D}${palmtopdir}/pics/security/
-}
-
diff --git a/opie-today-stocktickerplugin/opie-today-stocktickerplugin_1.1.6.oe b/opie-securityplugins/opie-securityplugin-dummy_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-today-stocktickerplugin/opie-today-stocktickerplugin_1.1.6.oe
+++ b/opie-securityplugins/opie-securityplugin-dummy_1.1.7.oe
diff --git a/opie-securityplugins/opie-securityplugin-notice_1.1.6.oe b/opie-securityplugins/opie-securityplugin-notice_1.1.6.oe
deleted file mode 100644
index 64c12b11c0..0000000000
--- a/opie-securityplugins/opie-securityplugin-notice_1.1.6.oe
+++ /dev/null
@@ -1,26 +0,0 @@
-DESCRIPTION = "Notice plugin for opie-security authentication. \
-It allows you to display, for example, a notice from your legal departement."
-SECTION = "opie/settings"
-PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
-LICENSE = "GPL"
-I18N_FILES = "libmultiauthnoticeplugin.ts"
-RDEPENDS = "opie-security"
-PR = "r1"
-
-APPNAME = "multiauthnoticeplugin"
-
-TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/noncore/securityplugins/notice \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/pics "
-
-S = "${WORKDIR}/notice"
-
-inherit opie
-
-# FILES plugins/security/libmultiauthnoticeplugin.so* pics/security/noticeplugin.png pics/security/noticeplugin_small.png
-do_install() {
-        install -d ${D}${palmtopdir}/pics/security/
-        install -m 0644 ${WORKDIR}/pics/security/noticeplugin*.png ${D}${palmtopdir}/pics/security/
-}
-
diff --git a/opie-today-todolistplugin/opie-today-todolistplugin_1.1.6.oe b/opie-securityplugins/opie-securityplugin-notice_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-today-todolistplugin/opie-today-todolistplugin_1.1.6.oe
+++ b/opie-securityplugins/opie-securityplugin-notice_1.1.7.oe
diff --git a/opie-securityplugins/opie-securityplugin-pin_1.1.6.oe b/opie-securityplugins/opie-securityplugin-pin_1.1.6.oe
deleted file mode 100644
index aa023b278e..0000000000
--- a/opie-securityplugins/opie-securityplugin-pin_1.1.6.oe
+++ /dev/null
@@ -1,28 +0,0 @@
-DESCRIPTION = "PIN plugin for opie-security authentication. \
-It implements the same kind of widgets as opie-security package, \
-but this implementation can be used along with other authentication \
-methods in the Opie Multi-Authentication Framework."
-SECTION = "opie/settings"
-PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
-LICENSE = "GPL"
-I18N_FILES = "libmultiauthpinplugin.ts"
-RDEPENDS = "opie-security"
-PR = "r1"
-
-APPNAME = "multiauthpinplugin"
-
-TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/noncore/securityplugins/pin \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/pics "
-
-S = "${WORKDIR}/pin"
-
-inherit opie
-
-# FILES plugins/security/libmultiauthpinplugin.so* pics/security/pinplugin.png
-do_install() {
-        install -d ${D}${palmtopdir}/pics/security/
-        install -m 0644 ${WORKDIR}/pics/security/pinplugin.png ${D}${palmtopdir}/pics/security/
-}
-
diff --git a/opie-today-weatherplugin/opie-today-weatherplugin_1.1.6.oe b/opie-securityplugins/opie-securityplugin-pin_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-today-weatherplugin/opie-today-weatherplugin_1.1.6.oe
+++ b/opie-securityplugins/opie-securityplugin-pin_1.1.7.oe
diff --git a/opie-today/opie-today_1.1.6.oe b/opie-sfcave/opie-sfcave_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-today/opie-today_1.1.6.oe
+++ b/opie-sfcave/opie-sfcave_1.1.7.oe
diff --git a/opie-todo/opie-todo_1.1.6.oe b/opie-sh/opie-sh_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-todo/opie-todo_1.1.6.oe
+++ b/opie-sh/opie-sh_1.1.7.oe
diff --git a/opie-tonleiter/opie-tonleiter_1.1.6.oe b/opie-sheet/opie-sheet_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-tonleiter/opie-tonleiter_1.1.6.oe
+++ b/opie-sheet/opie-sheet_1.1.7.oe
diff --git a/opie-unikeyboard/opie-unikeyboard_1.1.6.oe b/opie-showimg/opie-showimg_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-unikeyboard/opie-unikeyboard_1.1.6.oe
+++ b/opie-showimg/opie-showimg_1.1.7.oe
diff --git a/opie-usermanager/opie-usermanager_1.1.6.oe b/opie-snake/opie-snake_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-usermanager/opie-usermanager_1.1.6.oe
+++ b/opie-snake/opie-snake_1.1.7.oe
diff --git a/opie-vmemo-settings/opie-vmemo-settings_1.1.6.oe b/opie-solitaire/opie-solitaire_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-vmemo-settings/opie-vmemo-settings_1.1.6.oe
+++ b/opie-solitaire/opie-solitaire_1.1.7.oe
diff --git a/opie-volumeapplet/opie-volumeapplet_1.1.6.oe b/opie-sounds/opie-sounds_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-volumeapplet/opie-volumeapplet_1.1.6.oe
+++ b/opie-sounds/opie-sounds_1.1.7.oe
diff --git a/opie-vtapplet/opie-vtapplet_1.1.6.oe b/opie-sshkeys/opie-sshkeys_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-vtapplet/opie-vtapplet_1.1.6.oe
+++ b/opie-sshkeys/opie-sshkeys_1.1.7.oe
diff --git a/opie-wirelessapplet/opie-wirelessapplet_1.1.6.oe b/opie-style-flat/opie-style-flat_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-wirelessapplet/opie-wirelessapplet_1.1.6.oe
+++ b/opie-style-flat/opie-style-flat_1.1.7.oe
diff --git a/opie-wordgame/opie-wordgame_1.1.6.oe b/opie-style-fresh/opie-style-fresh_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-wordgame/opie-wordgame_1.1.6.oe
+++ b/opie-style-fresh/opie-style-fresh_1.1.7.oe
diff --git a/opie-write/opie-write_1.1.6.oe b/opie-style-liquid/opie-style-liquid_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-write/opie-write_1.1.6.oe
+++ b/opie-style-liquid/opie-style-liquid_1.1.7.oe
diff --git a/opie-zlines/opie-zlines_1.1.6.oe b/opie-style-metal/opie-style-metal_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-zlines/opie-zlines_1.1.6.oe
+++ b/opie-style-metal/opie-style-metal_1.1.7.oe
diff --git a/opie-zsafe/opie-zsafe_1.1.6.oe b/opie-style-phase/opie-style-phase_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-zsafe/opie-zsafe_1.1.6.oe
+++ b/opie-style-phase/opie-style-phase_1.1.7.oe
diff --git a/opie-zsame/opie-zsame_1.1.6.oe b/opie-style-web/opie-style-web_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-zsame/opie-zsame_1.1.6.oe
+++ b/opie-style-web/opie-style-web_1.1.7.oe
diff --git a/opie-suspendapplet/opie-suspendapplet_1.1.7.oe b/opie-suspendapplet/opie-suspendapplet_1.1.7.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/opie-suspendapplet/opie-suspendapplet_1.1.7.oe
diff --git a/opie-symlinker/opie-symlinker_1.1.7.oe b/opie-symlinker/opie-symlinker_1.1.7.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/opie-symlinker/opie-symlinker_1.1.7.oe
diff --git a/opie-sysinfo/opie-sysinfo_1.1.7.oe b/opie-sysinfo/opie-sysinfo_1.1.7.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/opie-sysinfo/opie-sysinfo_1.1.7.oe
diff --git a/opie-systemtime/opie-systemtime_1.1.6.oe b/opie-systemtime/opie-systemtime_1.1.6.oe
deleted file mode 100644
index 3bc5f4eea6..0000000000
--- a/opie-systemtime/opie-systemtime_1.1.6.oe
+++ /dev/null
@@ -1,29 +0,0 @@
-DESCRIPTION = "Set the system time - utilizing ntpdate, if available."
-SECTION = "opie/settings"
-PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
-LICENSE = "GPL"
-RRECOMMENDS = "ntpdate"
-
-
-APPNAME = "systemtime"
-
-TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/noncore/settings/netsystemtime \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/etc \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/apps"
-
-S = "${WORKDIR}/netsystemtime"
-
-inherit opie
-
-# FILES plugins/application/libsystemtime.so* bin/systemtime apps/Settings/systemtime.desktop etc/ntpservers pics/netsystemtime
-do_install() {
-        install -d ${D}${palmtopdir}/pics/netsystemtime/
-        install -d ${D}${palmtopdir}/etc
-        install -m 0644 ${WORKDIR}/pics/netsystemtime/*.png ${D}${palmtopdir}/pics/netsystemtime/
-        install -m 0644 ${WORKDIR}/etc/ntpservers ${D}${palmtopdir}/etc
-}
-
-FILES_opie-systemtime_append = " /etc/ntpservers"
diff --git a/opie-systemtime/opie-systemtime_1.1.7.oe b/opie-systemtime/opie-systemtime_1.1.7.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/opie-systemtime/opie-systemtime_1.1.7.oe
diff --git a/opie-tableviewer/opie-tableviewer_1.1.7.oe b/opie-tableviewer/opie-tableviewer_1.1.7.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/opie-tableviewer/opie-tableviewer_1.1.7.oe
diff --git a/opie-tabmanager/opie-tabmanager_1.1.7.oe b/opie-tabmanager/opie-tabmanager_1.1.7.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/opie-tabmanager/opie-tabmanager_1.1.7.oe
diff --git a/opie-taskbar/opie-taskbar/server.pro-1.1.6 b/opie-taskbar/opie-taskbar/server.pro-1.1.6
deleted file mode 100644
index c262de99e2..0000000000
--- a/opie-taskbar/opie-taskbar/server.pro-1.1.6
+++ /dev/null
@@ -1,82 +0,0 @@
-TEMPLATE	= app
-
-CONFIG		+= qt warn_on 
-
-DESTDIR		= 
-
-HEADERS		+= server.h \
-		  serverinterface.h \
-		  launchertab.h \
-		  documentlist.h \
-		  appicons.h \
-		  taskbar.h \
-                  runningappbar.h \
-		  applauncher.h \
-		  stabmon.h \
-		  inputmethods.h \
-		  systray.h \
-		  wait.h \
-		  shutdownimpl.h \
-		  launcher.h \
-		  launcherview.h \
-		  calibrate/calibrate.h \
-		  startmenu.h \
-		  transferserver.h \
-		  qcopbridge.h \
-		  packageslave.h \
-		  irserver.h \
-		  firstuse.h \
-		  syncdialog.h \
-		  serverapp.h \
-		  qprocess.h \
-		  screensaver.h \
-		  mediummount/mediumwidget.h \
-                  mediadlg.h
-
-SOURCES		+= server.cpp \
-		  serverinterface.cpp \
-		  launchertab.cpp \
-		  documentlist.cpp \
-		  appicons.cpp \
-		  taskbar.cpp \
-                  runningappbar.cpp \
-		  applauncher.cpp \
-		  stabmon.cpp \
-		  inputmethods.cpp \
-		  systray.cpp \
-		  wait.cpp \
-		  shutdownimpl.cpp \
-		  launcher.cpp \
-		  launcherview.cpp \
-		  calibrate/calibrate.cpp \
-		  transferserver.cpp \
-		  packageslave.cpp \
-   		  irserver.cpp \
-		  qcopbridge.cpp \
-		  startmenu.cpp \
-		  main.cpp \
-		  firstuse.cpp \
-		  syncdialog.cpp \
-		  serverapp.cpp \
-		  qprocess.cpp \
-		  qprocess_unix.cpp \
-		  screensaver.cpp \
-		  mediummount/mediumwidget.cc \
-                  mediadlg.cpp
-
-
-INCLUDEPATH += calibrate
-DEPENDPATH	+= calibrate
-
-INCLUDEPATH += $(OPIEDIR)/include rsync
-DEPENDPATH	+= rsync
-
-INCLUDEPATH += mediummount
-DEPENDPATH	+= mediummount
-
-
-TARGET		= qpe
-
-LIBS = -lqpe -lopiecore2 -lopieui2 -lopiesecurity2 -lqrsync
-
-include ( $(OPIEDIR)/include.pro )
diff --git a/opie-taskbar/opie-taskbar/server.pro-1.1.7 b/opie-taskbar/opie-taskbar/server.pro-1.1.7
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/opie-taskbar/opie-taskbar/server.pro-1.1.7
diff --git a/opie-taskbar/opie-taskbar_1.1.6.oe b/opie-taskbar/opie-taskbar_1.1.6.oe
deleted file mode 100644
index 0379e9a67b..0000000000
--- a/opie-taskbar/opie-taskbar_1.1.6.oe
+++ /dev/null
@@ -1,126 +0,0 @@
-DESCRIPTION = "Opie Launcher and Taskbar"
-SECTION = "opie/base"
-PRIORITY = "optional"
-LICENSE = "GPL"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
-DEPENDS = "opie-libqrsync"
-
-APPNAME = "qpe"
-PR = "r1"
-
-TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/core/apps/calibrate \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/noncore/settings/mediummount \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/core/launcher \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/apps \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/root \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/etc \
-           file://server.pro-1.1.6 \
-           file://opie-reorgfiles \
-           file://opie \
-           file://qpe.conf"
-
-S = "${WORKDIR}/launcher"
-
-# Caps/Numlock icons for devices with keyboard
-EXTRA_QMAKEVARS_POST_append_collie 	= "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE"
-EXTRA_QMAKEVARS_POST_append_poodle 	= "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE"
-EXTRA_QMAKEVARS_POST_append_shepherd 	= "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE"
-EXTRA_QMAKEVARS_POST_append_corgi 	= "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE"
-EXTRA_QMAKEVARS_POST_append_husky 	= "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE"
-EXTRA_QMAKEVARS_POST_append_tosa 	= "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE"
-
-# Wallpaper and welcome splash
-PIXMAP_SIZE 		= ""
-PIXMAP_SIZE_shepherd 	= "-640x480"
-PIXMAP_SIZE_corgi 	= "-640x480"
-PIXMAP_SIZE_husky 	= "-640x480"
-PIXMAP_SIZE_tosa 	= "-640x480"
-PIXMAP_SIZE_simpad 	= "-800x600"
-
-inherit opie update-rc.d
-
-INITSCRIPT_NAME = "opie"
-INITSCRIPT_PARAMS = "defaults 99"
-
-do_configure_prepend() {
-	ln -s ${WORKDIR}/calibrate ${S}/calibrate
-	ln -s ${WORKDIR}/mediummount ${S}/mediummount
-	install -m 0644 ${WORKDIR}/server.pro-1.1.6 ${S}/server.pro
-}
-
-do_stage() {
-    install obexinterface.h ${STAGING_INCDIR}/
-
-}
-
-SECTIONS = "1Pim Applications Examples Games Opie-SH Python Settings"
-PICS = "opielogo32x32.png start_button.png new_wait.png opielogo16x16.png sidebar.png"
-
-do_install() {
-	install -d ${D}/${palmtopdir}/bin
-	for i in ${SECTIONS}
-	do
-		install -d ${D}/${palmtopdir}/apps/$i/
-		install -m 0644 ${WORKDIR}/apps/$i/.directory ${D}/${palmtopdir}/apps/$i/
-	done
-	install -d ${D}/${palmtopdir}/pics/launcher
-	install -d ${D}/${palmtopdir}/pics/logo
-	install -d ${D}/${palmtopdir}/pics/RoH/star/
-	install -d ${D}/etc/init.d
-	install -d ${D}/${palmtopdir}/etc/colors
-	install -d ${D}/${palmtopdir}/etc/skel
-
-	install -m 0755 ${S}/qpe ${D}/${palmtopdir}/bin/qpe
-	install -m 0755 ${WORKDIR}/opie-reorgfiles ${D}/${palmtopdir}/bin/
-	install -m 0644 ${WORKDIR}/apps/Settings/calibrate.desktop ${D}/${palmtopdir}/apps/Settings/
-	install -m 0644 ${WORKDIR}/apps/Settings/quit.desktop ${D}/${palmtopdir}/apps/Settings/
-
-	for p in ${PICS}
-	do
-		install -m 0644 ${WORKDIR}/pics/launcher/$p ${D}/${palmtopdir}/pics/launcher/$p
-	done
-	install -m 0644 ${WORKDIR}/pics/launcher/firstuse${PIXMAP_SIZE}.jpg ${D}/${palmtopdir}/pics/launcher/firstuse.jpg
-	install -m 0644 ${WORKDIR}/pics/launcher/opie-background${PIXMAP_SIZE}.jpg ${D}/${palmtopdir}/pics/launcher/opie-background.jpg
-
-	install -m 0644 ${WORKDIR}/pics/logo/*.* ${D}/${palmtopdir}/pics/logo/
-	install -m 0644 ${WORKDIR}/pics/RoH/star/*.png ${D}/${palmtopdir}/pics/RoH/star/
-
-	install -m 0644 ${WORKDIR}/etc/colors/*.scheme ${D}/${palmtopdir}/etc/colors/
-	install -m 0644 ${WORKDIR}/etc/mime.types ${D}/etc/
-
-	install -m 0755 ${WORKDIR}/opie ${D}/etc/init.d/opie
-	install -m 0644 ${WORKDIR}/qpe.conf ${D}/${palmtopdir}/etc/skel/
-}
-
-# These two should be installed only on devices with keyboard
-do_install_append_collie () {
-	install -m 0644 ${WORKDIR}/pics/capslock.xpm ${D}/${palmtopdir}/pics/
-	install -m 0644 ${WORKDIR}/pics/numlock.xpm ${D}/${palmtopdir}/pics/
-}
-do_install_append_poodle () {
-	install -m 0644 ${WORKDIR}/pics/capslock.xpm ${D}/${palmtopdir}/pics/
-	install -m 0644 ${WORKDIR}/pics/numlock.xpm ${D}/${palmtopdir}/pics/
-}
-do_install_append_corgi () {
-	install -m 0644 ${WORKDIR}/pics/capslock.xpm ${D}/${palmtopdir}/pics/
-	install -m 0644 ${WORKDIR}/pics/numlock.xpm ${D}/${palmtopdir}/pics/
-}
-do_install_append_shepherd () {
-	install -m 0644 ${WORKDIR}/pics/capslock.xpm ${D}/${palmtopdir}/pics/
-	install -m 0644 ${WORKDIR}/pics/numlock.xpm ${D}/${palmtopdir}/pics/
-}
-do_install_append_husky () {
-	install -m 0644 ${WORKDIR}/pics/capslock.xpm ${D}/${palmtopdir}/pics/
-	install -m 0644 ${WORKDIR}/pics/numlock.xpm ${D}/${palmtopdir}/pics/
-}
-do_install_append_tosa () {
-	install -m 0644 ${WORKDIR}/pics/capslock.xpm ${D}/${palmtopdir}/pics/
-	install -m 0644 ${WORKDIR}/pics/numlock.xpm ${D}/${palmtopdir}/pics/
-}
-
-FILES_opie-taskbar_append = " /etc ${palmtopdir}/apps ${palmtopdir}/pics"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
diff --git a/opie-taskbar/opie-taskbar_1.1.7.oe b/opie-taskbar/opie-taskbar_1.1.7.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/opie-taskbar/opie-taskbar_1.1.7.oe
diff --git a/opie-tetrix/opie-tetrix_1.1.7.oe b/opie-tetrix/opie-tetrix_1.1.7.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/opie-tetrix/opie-tetrix_1.1.7.oe
diff --git a/opie-textedit/opie-textedit_1.1.7.oe b/opie-textedit/opie-textedit_1.1.7.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/opie-textedit/opie-textedit_1.1.7.oe
diff --git a/opie-theme/opie-theme_1.1.7.oe b/opie-theme/opie-theme_1.1.7.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/opie-theme/opie-theme_1.1.7.oe
diff --git a/opie-tictac/opie-tictac_1.1.7.oe b/opie-tictac/opie-tictac_1.1.7.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/opie-tictac/opie-tictac_1.1.7.oe
diff --git a/opie-tinykate/opie-tinykate_1.1.7.oe b/opie-tinykate/opie-tinykate_1.1.7.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/opie-tinykate/opie-tinykate_1.1.7.oe
diff --git a/opie-today-addressbookplugin/opie-today-addressbookplugin_1.1.7.oe b/opie-today-addressbookplugin/opie-today-addressbookplugin_1.1.7.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/opie-today-addressbookplugin/opie-today-addressbookplugin_1.1.7.oe
diff --git a/opie-today-datebookplugin/opie-today-datebookplugin_1.1.7.oe b/opie-today-datebookplugin/opie-today-datebookplugin_1.1.7.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/opie-today-datebookplugin/opie-today-datebookplugin_1.1.7.oe
diff --git a/opie-today-fortuneplugin/opie-today-fortuneplugin_1.1.7.oe b/opie-today-fortuneplugin/opie-today-fortuneplugin_1.1.7.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/opie-today-fortuneplugin/opie-today-fortuneplugin_1.1.7.oe
diff --git a/opie-today-mailplugin/opie-today-mailplugin_1.1.7.oe b/opie-today-mailplugin/opie-today-mailplugin_1.1.7.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/opie-today-mailplugin/opie-today-mailplugin_1.1.7.oe
diff --git a/opie-today-stocktickerplugin/opie-today-stocktickerplugin_1.1.7.oe b/opie-today-stocktickerplugin/opie-today-stocktickerplugin_1.1.7.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/opie-today-stocktickerplugin/opie-today-stocktickerplugin_1.1.7.oe
diff --git a/opie-today-todolistplugin/opie-today-todolistplugin_1.1.7.oe b/opie-today-todolistplugin/opie-today-todolistplugin_1.1.7.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/opie-today-todolistplugin/opie-today-todolistplugin_1.1.7.oe
diff --git a/opie-today-weatherplugin/opie-today-weatherplugin_1.1.7.oe b/opie-today-weatherplugin/opie-today-weatherplugin_1.1.7.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/opie-today-weatherplugin/opie-today-weatherplugin_1.1.7.oe
diff --git a/opie-today/opie-today_1.1.7.oe b/opie-today/opie-today_1.1.7.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/opie-today/opie-today_1.1.7.oe
diff --git a/opie-todo/opie-todo_1.1.7.oe b/opie-todo/opie-todo_1.1.7.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/opie-todo/opie-todo_1.1.7.oe
diff --git a/opie-tonleiter/opie-tonleiter_1.1.7.oe b/opie-tonleiter/opie-tonleiter_1.1.7.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/opie-tonleiter/opie-tonleiter_1.1.7.oe
diff --git a/opie-unikeyboard/opie-unikeyboard_1.1.7.oe b/opie-unikeyboard/opie-unikeyboard_1.1.7.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/opie-unikeyboard/opie-unikeyboard_1.1.7.oe
diff --git a/opie-usermanager/opie-usermanager_1.1.7.oe b/opie-usermanager/opie-usermanager_1.1.7.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/opie-usermanager/opie-usermanager_1.1.7.oe
diff --git a/opie-vmemo-settings/opie-vmemo-settings_1.1.7.oe b/opie-vmemo-settings/opie-vmemo-settings_1.1.7.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/opie-vmemo-settings/opie-vmemo-settings_1.1.7.oe
diff --git a/opie-vmemo/opie-vmemo_1.1.6.oe b/opie-vmemo/opie-vmemo_1.1.6.oe
deleted file mode 100644
index 28bf676027..0000000000
--- a/opie-vmemo/opie-vmemo_1.1.6.oe
+++ /dev/null
@@ -1,36 +0,0 @@
-DESCRIPTION = "Voice Memo Recorder Applet"
-SECTION = "opie/applets"
-PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
-LICENSE = "GPL"
-RDEPENDS = "opie-vmemo-settings"
-I18N_FILES = "libvmemoapplet.ts"
-
-APPNAME = "vmemoapplet"
-
-TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/core/applets/vmemo \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/apps"
-
-S = "${WORKDIR}/vmemo"
-
-inherit opie
-
-pkg_postinst() {
-#!/bin/sh
-if pidof -s qpe >/dev/null; then
-  /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
-fi
- if [ -n "$D" ]; then exit 1; fi
-}
-
-pkg_postrm() {
-#!/bin/sh
-/opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
- if [ -n "$D" ]; then exit 1; fi
-}
-
-# FILES plugins/applets/libvmemoapplet.so*
-do_install() {
-}
-
diff --git a/opie-vmemo/opie-vmemo_1.1.7.oe b/opie-vmemo/opie-vmemo_1.1.7.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/opie-vmemo/opie-vmemo_1.1.7.oe
diff --git a/opie-volumeapplet/opie-volumeapplet_1.1.7.oe b/opie-volumeapplet/opie-volumeapplet_1.1.7.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/opie-volumeapplet/opie-volumeapplet_1.1.7.oe
diff --git a/opie-vtapplet/opie-vtapplet_1.1.7.oe b/opie-vtapplet/opie-vtapplet_1.1.7.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/opie-vtapplet/opie-vtapplet_1.1.7.oe
diff --git a/opie-wirelessapplet/opie-wirelessapplet_1.1.7.oe b/opie-wirelessapplet/opie-wirelessapplet_1.1.7.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/opie-wirelessapplet/opie-wirelessapplet_1.1.7.oe
diff --git a/opie-wordgame/opie-wordgame_1.1.7.oe b/opie-wordgame/opie-wordgame_1.1.7.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/opie-wordgame/opie-wordgame_1.1.7.oe
diff --git a/opie-write/opie-write_1.1.7.oe b/opie-write/opie-write_1.1.7.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/opie-write/opie-write_1.1.7.oe
diff --git a/opie-zkbapplet/opie-zkbapplet_1.1.6.oe b/opie-zkbapplet/opie-zkbapplet_1.1.6.oe
deleted file mode 100644
index 66e5b9c6dc..0000000000
--- a/opie-zkbapplet/opie-zkbapplet_1.1.6.oe
+++ /dev/null
@@ -1,34 +0,0 @@
-DESCRIPTION = "KeyZ Applet"
-SECTION = "opie/applets"
-PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
-LICENSE = "GPL"
-
-I18N_FILES = "keyz-cfg.ts"
-APPNAME = "zkbapplet"
-RDEPENDS = "opie-pics"
-PR = "r1"
-
-CVSDATE = "20041015"
-
-TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/noncore/applets/zkbapplet \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/share \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/apps"
-
-S = "${WORKDIR}/${APPNAME}"
-
-inherit opie
-
-do_install() {
-        install -d ${D}${palmtopdir}/pics/
-        install -d ${D}${palmtopdir}/share/zkb/
-        install -m 0644 ${WORKDIR}/share/zkb/*xml* ${D}${palmtopdir}/share/zkb/
-	install -m 0644 ${WORKDIR}/share/zkb/zkb.xml.sample ${D}${palmtopdir}/share/zkb/zkb.xml
-        install -d ${D}${palmtopdir}/bin
-        install -m 0755 ${S}/keyz-cfg ${D}${palmtopdir}/bin/
-        install -d ${D}${palmtopdir}/apps/Settings
-        install -m 0644 ${WORKDIR}/apps/Settings/keyz-cfg.desktop ${D}${palmtopdir}/apps/Settings/
-}
-
diff --git a/opie-zkbapplet/opie-zkbapplet_1.1.7.oe b/opie-zkbapplet/opie-zkbapplet_1.1.7.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/opie-zkbapplet/opie-zkbapplet_1.1.7.oe
diff --git a/opie-zlines/opie-zlines_1.1.7.oe b/opie-zlines/opie-zlines_1.1.7.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/opie-zlines/opie-zlines_1.1.7.oe
diff --git a/opie-zsafe/opie-zsafe_1.1.7.oe b/opie-zsafe/opie-zsafe_1.1.7.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/opie-zsafe/opie-zsafe_1.1.7.oe
diff --git a/opie-zsame/opie-zsame_1.1.7.oe b/opie-zsame/opie-zsame_1.1.7.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/opie-zsame/opie-zsame_1.1.7.oe