Merge bk://oe-devel@oe-devel.bkbits.net/openembedded

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

2005/02/02 22:44:37+01:00 handhelds.org!zecke
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into handhelds.org:/home/ich/programming/oe/opemembedded-i18n

2005/02/02 22:43:34+01:00 handhelds.org!zecke
Opie 1.1.9 will be tagged soon, update the .bb files to use 1.1.9 now

BKrev: 42014b5fonMJIdtk9cHQS5Dw2tcXUA

202 files changed, 0 insertions, 957 deletions

diff --git a/packages/libmailwrapper/libmailwrapper_1.1.8.bb b/packages/libmailwrapper/libmailwrapper_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/libmailwrapper/libmailwrapper_1.1.8.bb
+++ b/packages/libmailwrapper/libmailwrapper_1.1.9.bb
diff --git a/packages/libopie/libopie2_1.1.8.bb b/packages/libopie/libopie2_1.1.8.bb
deleted file mode 100644
index 84cb457160..0000000000
--- a/packages/libopie/libopie2_1.1.8.bb
+++ /dev/null
@@ -1,85 +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 sqlite3 libpcap"
-PROVIDES = "libopiecore2 libopiedb2 libopiemm2 libopiesecurity2 libopienet2 libopiepim2 libopieui2 "
-PR = "r5"
-
-TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
-SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/libopie2 \
-           file://include.pro"
-S = "${WORKDIR}/libopie2"
-
-inherit opie
-
-PARALLEL_MAKE = ""
-
-#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 bb, re
-    if (re.match('.*uclibc$', bb.data.getVar('TARGET_OS', d, 1)) != None):
-        bb.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
-
-	for i in opimcontactsortvector.h opimoccurrence_p.h opimsortvector.h opimtodosortvector.h vobject_p.h
-	do
-		install -m 0644 opiepim/private/$i ${STAGING_INCDIR}/opie2/private/
-	done
-
-	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/packages/libopieobex/libopieobex0_1.1.8.bb b/packages/libopie/libopie2_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/libopieobex/libopieobex0_1.1.8.bb
+++ b/packages/libopie/libopie2_1.1.9.bb
diff --git a/packages/libqtaux/libqtaux2_1.1.8.bb b/packages/libopieobex/libopieobex0_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/libqtaux/libqtaux2_1.1.8.bb
+++ b/packages/libopieobex/libopieobex0_1.1.9.bb
diff --git a/packages/libopietooth/libopietooth1_1.1.8.bb b/packages/libopietooth/libopietooth1_1.1.8.bb
deleted file mode 100644
index 961ea8931e..0000000000
--- a/packages/libopietooth/libopietooth1_1.1.8.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-DESCRIPTION = "Opie Bluetooth library"
-SECTION = "opie/libs"
-PRIORITY = "optional"
-DEPENDS = "libopie2"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
-LICENSE = "LGPL"
-
-TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
-SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/opietooth/lib"
-
-inherit opie
-
-
-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/packages/opie-aboutapplet/opie-aboutapplet_1.1.8.bb b/packages/libopietooth/libopietooth1_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-aboutapplet/opie-aboutapplet_1.1.8.bb
+++ b/packages/libopietooth/libopietooth1_1.1.9.bb
diff --git a/packages/libqpe/libqpe-opie_1.1.8.bb b/packages/libqpe/libqpe-opie_1.1.8.bb
deleted file mode 100644
index 2dd3fe7703..0000000000
--- a/packages/libqpe/libqpe-opie_1.1.8.bb
+++ /dev/null
@@ -1,61 +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"
-PR = "r4"
-
-TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
-SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/library \
-	file://nomax.patch;patch=1;pnum=1"
-	
-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"
-
-CXXFLAGS_append_husky = " -DOPIE_NO_WINDOWED "
-CXXFLAGS_append_corgi = " -DOPIE_NO_WINDOWED "
-CXXFLAGS_append_shepherd = " -DOPIE_NO_WINDOWED "
-XXFLAGS_append_tosa = " -DOPIE_NO_WINDOWED "
-
-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/packages/opie-addressbook/opie-addressbook_1.1.8.bb b/packages/libqpe/libqpe-opie_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-addressbook/opie-addressbook_1.1.8.bb
+++ b/packages/libqpe/libqpe-opie_1.1.9.bb
diff --git a/packages/opie-advancedfm/opie-advancedfm_1.1.8.bb b/packages/libqtaux/libqtaux2_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-advancedfm/opie-advancedfm_1.1.8.bb
+++ b/packages/libqtaux/libqtaux2_1.1.9.bb
diff --git a/packages/opie-appearance/opie-appearance_1.1.8.bb b/packages/opie-aboutapplet/opie-aboutapplet_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-appearance/opie-appearance_1.1.8.bb
+++ b/packages/opie-aboutapplet/opie-aboutapplet_1.1.9.bb
diff --git a/packages/opie-aqpkg/opie-aqpkg_1.1.8.bb b/packages/opie-addressbook/opie-addressbook_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-aqpkg/opie-aqpkg_1.1.8.bb
+++ b/packages/opie-addressbook/opie-addressbook_1.1.9.bb
diff --git a/packages/opie-autorotateapplet/opie-autorotateapplet_1.1.8.bb b/packages/opie-advancedfm/opie-advancedfm_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-autorotateapplet/opie-autorotateapplet_1.1.8.bb
+++ b/packages/opie-advancedfm/opie-advancedfm_1.1.9.bb
diff --git a/packages/opie-alarm/opie-alarm_1.1.8.bb b/packages/opie-alarm/opie-alarm_1.1.8.bb
deleted file mode 100644
index 26c74416a8..0000000000
--- a/packages/opie-alarm/opie-alarm_1.1.8.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-DESCRIPTION = "Opie Alarm"
-SECTION = "opie/base"
-PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
-LICENSE = "GPL"
-DEPENDS = "apmd"
-RDEPENDS = "apmd"
-PR = "r1"
-
-TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
-SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/opiealarm \
-           file://01opiealarm "
-S = "${WORKDIR}/opiealarm"
-
-inherit opie
-
-do_install() {
-	install -d ${D}/${palmtopdir}/bin/ ${D}/${sysconfdir}/apm/event.d/
-	install -m 0755 ${S}/opiealarm ${D}/${palmtopdir}/bin/
-	install -m 0755 ${WORKDIR}/01opiealarm ${D}/${sysconfdir}/apm/event.d/
-}
-
-FILES_${PN} = "${palmtopdir}/bin/opiealarm ${sysconfdir}/apm/event.d/01opiealarm"
diff --git a/packages/opie-backup/opie-backup_1.1.8.bb b/packages/opie-alarm/opie-alarm_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-backup/opie-backup_1.1.8.bb
+++ b/packages/opie-alarm/opie-alarm_1.1.9.bb
diff --git a/packages/opie-batteryapplet/opie-batteryapplet_1.1.8.bb b/packages/opie-appearance/opie-appearance_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-batteryapplet/opie-batteryapplet_1.1.8.bb
+++ b/packages/opie-appearance/opie-appearance_1.1.9.bb
diff --git a/packages/opie-bluepin/opie-bluepin_1.1.8.bb b/packages/opie-aqpkg/opie-aqpkg_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-bluepin/opie-bluepin_1.1.8.bb
+++ b/packages/opie-aqpkg/opie-aqpkg_1.1.9.bb
diff --git a/packages/opie-bluetoothapplet/opie-bluetoothapplet_1.1.8.bb b/packages/opie-autorotateapplet/opie-autorotateapplet_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-bluetoothapplet/opie-bluetoothapplet_1.1.8.bb
+++ b/packages/opie-autorotateapplet/opie-autorotateapplet_1.1.9.bb
diff --git a/packages/opie-backgammon/opie-backgammon_1.1.8.bb b/packages/opie-backgammon/opie-backgammon_1.1.8.bb
deleted file mode 100644
index 0577a9f6aa..0000000000
--- a/packages/opie-backgammon/opie-backgammon_1.1.8.bb
+++ /dev/null
@@ -1,31 +0,0 @@
-DESCRIPTION = "Backgammon Game"
-SECTION = "opie/games"
-PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
-LICENSE = "GPL"
-
-APPNAME = "backgammon"
-APPTYPE = "binary"
-
-TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
-SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/backgammon \
-           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
-           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
-
-S = "${WORKDIR}/${APPNAME}"
-
-inherit opie
-
-# FILES plugins/application/libbackgammon.so* bin/backgammon apps/Games/backgammon.desktop pics/backgammon help/en/html/backgammon.html
-do_install() {
-        install -d ${D}${palmtopdir}/pics/${APPNAME}/
-        install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
-	
-	for dir in boards dice odds pieces table
-	do
-		install -d ${D}${palmtopdir}/pics/${APPNAME}/$dir
-		install -m 644 ${WORKDIR}/pics/${APPNAME}/$dir/*.png ${D}${palmtopdir}/pics/${APPNAME}/$dir
-	done
-		
-}
-
diff --git a/packages/opie-bluetoothmanager/opie-bluetoothmanager_1.1.8.bb b/packages/opie-backgammon/opie-backgammon_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-bluetoothmanager/opie-bluetoothmanager_1.1.8.bb
+++ b/packages/opie-backgammon/opie-backgammon_1.1.9.bb
diff --git a/packages/opie-bounce/opie-bounce_1.1.8.bb b/packages/opie-backup/opie-backup_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-bounce/opie-bounce_1.1.8.bb
+++ b/packages/opie-backup/opie-backup_1.1.9.bb
diff --git a/packages/opie-bartender/opie-bartender_1.1.8.bb b/packages/opie-bartender/opie-bartender_1.1.8.bb
deleted file mode 100644
index e91b6d0a80..0000000000
--- a/packages/opie-bartender/opie-bartender_1.1.8.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-DESCRIPTION = "Bartender drink receipe database"
-SECTION = "opie/applications"
-PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
-LICENSE = "GPL"
-APPNAME = "bartender"
-
-TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
-SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/opie-bartender \
-           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
-           ${HANDHELDS_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/packages/opie-brightnessapplet/opie-brightnessapplet_1.1.8.bb b/packages/opie-bartender/opie-bartender_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-brightnessapplet/opie-brightnessapplet_1.1.8.bb
+++ b/packages/opie-bartender/opie-bartender_1.1.9.bb
diff --git a/packages/opie-button-settings/opie-button-settings_1.1.8.bb b/packages/opie-batteryapplet/opie-batteryapplet_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-button-settings/opie-button-settings_1.1.8.bb
+++ b/packages/opie-batteryapplet/opie-batteryapplet_1.1.9.bb
diff --git a/packages/opie-buzzword/opie-buzzword_1.1.8.bb b/packages/opie-bluepin/opie-bluepin_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-buzzword/opie-buzzword_1.1.8.bb
+++ b/packages/opie-bluepin/opie-bluepin_1.1.9.bb
diff --git a/packages/opie-calculator/opie-calculator_1.1.8.bb b/packages/opie-bluetoothapplet/opie-bluetoothapplet_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-calculator/opie-calculator_1.1.8.bb
+++ b/packages/opie-bluetoothapplet/opie-bluetoothapplet_1.1.9.bb
diff --git a/packages/opie-calibrate/opie-calibrate_1.1.8.bb b/packages/opie-bluetoothmanager/opie-bluetoothmanager_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-calibrate/opie-calibrate_1.1.8.bb
+++ b/packages/opie-bluetoothmanager/opie-bluetoothmanager_1.1.9.bb
diff --git a/packages/opie-cardmon/opie-cardmon_1.1.8.bb b/packages/opie-bounce/opie-bounce_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-cardmon/opie-cardmon_1.1.8.bb
+++ b/packages/opie-bounce/opie-bounce_1.1.9.bb
diff --git a/packages/opie-citytime/opie-citytime_1.1.8.bb b/packages/opie-brightnessapplet/opie-brightnessapplet_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-citytime/opie-citytime_1.1.8.bb
+++ b/packages/opie-brightnessapplet/opie-brightnessapplet_1.1.9.bb
diff --git a/packages/opie-clipboardapplet/opie-clipboardapplet_1.1.8.bb b/packages/opie-button-settings/opie-button-settings_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-clipboardapplet/opie-clipboardapplet_1.1.8.bb
+++ b/packages/opie-button-settings/opie-button-settings_1.1.9.bb
diff --git a/packages/opie-clock/opie-clock_1.1.8.bb b/packages/opie-buzzword/opie-buzzword_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-clock/opie-clock_1.1.8.bb
+++ b/packages/opie-buzzword/opie-buzzword_1.1.9.bb
diff --git a/packages/opie-clockapplet/opie-clockapplet_1.1.8.bb b/packages/opie-calculator/opie-calculator_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-clockapplet/opie-clockapplet_1.1.8.bb
+++ b/packages/opie-calculator/opie-calculator_1.1.9.bb
diff --git a/packages/opie-confeditor/opie-confeditor_1.1.8.bb b/packages/opie-calibrate/opie-calibrate_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-confeditor/opie-confeditor_1.1.8.bb
+++ b/packages/opie-calibrate/opie-calibrate_1.1.9.bb
diff --git a/packages/opie-console/opie-console_1.1.8.bb b/packages/opie-cardmon/opie-cardmon_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-console/opie-console_1.1.8.bb
+++ b/packages/opie-cardmon/opie-cardmon_1.1.9.bb
diff --git a/packages/opie-dagger/opie-dagger_1.1.8.bb b/packages/opie-citytime/opie-citytime_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-dagger/opie-dagger_1.1.8.bb
+++ b/packages/opie-citytime/opie-citytime_1.1.9.bb
diff --git a/packages/opie-dasher/opie-dasher_1.1.8.bb b/packages/opie-clipboardapplet/opie-clipboardapplet_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-dasher/opie-dasher_1.1.8.bb
+++ b/packages/opie-clipboardapplet/opie-clipboardapplet_1.1.9.bb
diff --git a/packages/opie-datebook/opie-datebook_1.1.8.bb b/packages/opie-clock/opie-clock_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-datebook/opie-datebook_1.1.8.bb
+++ b/packages/opie-clock/opie-clock_1.1.9.bb
diff --git a/packages/opie-deco-flat/opie-deco-flat_1.1.8.bb b/packages/opie-clockapplet/opie-clockapplet_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-deco-flat/opie-deco-flat_1.1.8.bb
+++ b/packages/opie-clockapplet/opie-clockapplet_1.1.9.bb
diff --git a/packages/opie-deco-liquid/opie-deco-liquid_1.1.8.bb b/packages/opie-confeditor/opie-confeditor_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-deco-liquid/opie-deco-liquid_1.1.8.bb
+++ b/packages/opie-confeditor/opie-confeditor_1.1.9.bb
diff --git a/packages/opie-deco-polished/opie-deco-polished_1.1.8.bb b/packages/opie-console/opie-console_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-deco-polished/opie-deco-polished_1.1.8.bb
+++ b/packages/opie-console/opie-console_1.1.9.bb
diff --git a/packages/opie-doctab/opie-doctab_1.1.8.bb b/packages/opie-dagger/opie-dagger_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-doctab/opie-doctab_1.1.8.bb
+++ b/packages/opie-dagger/opie-dagger_1.1.9.bb
diff --git a/packages/opie-drawpad/opie-drawpad_1.1.8.bb b/packages/opie-dasher/opie-dasher_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-drawpad/opie-drawpad_1.1.8.bb
+++ b/packages/opie-dasher/opie-dasher_1.1.9.bb
diff --git a/packages/opie-dvorak/opie-dvorak_1.1.8.bb b/packages/opie-datebook/opie-datebook_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-dvorak/opie-dvorak_1.1.8.bb
+++ b/packages/opie-datebook/opie-datebook_1.1.9.bb
diff --git a/packages/opie-embeddedkonsole/opie-embeddedkonsole_1.1.8.bb b/packages/opie-deco-flat/opie-deco-flat_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-embeddedkonsole/opie-embeddedkonsole_1.1.8.bb
+++ b/packages/opie-deco-flat/opie-deco-flat_1.1.9.bb
diff --git a/packages/opie-euroconv/opie-euroconv_1.1.8.bb b/packages/opie-deco-liquid/opie-deco-liquid_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-euroconv/opie-euroconv_1.1.8.bb
+++ b/packages/opie-deco-liquid/opie-deco-liquid_1.1.9.bb
diff --git a/packages/opie-examples-python/opie-examples-python_1.1.8.bb b/packages/opie-deco-polished/opie-deco-polished_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-examples-python/opie-examples-python_1.1.8.bb
+++ b/packages/opie-deco-polished/opie-deco-polished_1.1.9.bb
diff --git a/packages/opie-eye/opie-eye_1.1.8.bb b/packages/opie-doctab/opie-doctab_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-eye/opie-eye_1.1.8.bb
+++ b/packages/opie-doctab/opie-doctab_1.1.9.bb
diff --git a/packages/opie-fifteen/opie-fifteen_1.1.8.bb b/packages/opie-drawpad/opie-drawpad_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-fifteen/opie-fifteen_1.1.8.bb
+++ b/packages/opie-drawpad/opie-drawpad_1.1.9.bb
diff --git a/packages/opie-formatter/opie-formatter_1.1.8.bb b/packages/opie-dvorak/opie-dvorak_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-formatter/opie-formatter_1.1.8.bb
+++ b/packages/opie-dvorak/opie-dvorak_1.1.9.bb
diff --git a/packages/opie-ftplib/opie-ftplib_1.1.8.bb b/packages/opie-embeddedkonsole/opie-embeddedkonsole_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-ftplib/opie-ftplib_1.1.8.bb
+++ b/packages/opie-embeddedkonsole/opie-embeddedkonsole_1.1.9.bb
diff --git a/packages/opie-go/opie-go_1.1.8.bb b/packages/opie-euroconv/opie-euroconv_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-go/opie-go_1.1.8.bb
+++ b/packages/opie-euroconv/opie-euroconv_1.1.9.bb
diff --git a/packages/opie-gutenbrowser/opie-gutenbrowser_1.1.8.bb b/packages/opie-examples-python/opie-examples-python_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-gutenbrowser/opie-gutenbrowser_1.1.8.bb
+++ b/packages/opie-examples-python/opie-examples-python_1.1.9.bb
diff --git a/packages/opie-handwriting/opie-handwriting_1.1.8.bb b/packages/opie-eye/opie-eye_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-handwriting/opie-handwriting_1.1.8.bb
+++ b/packages/opie-eye/opie-eye_1.1.9.bb
diff --git a/packages/opie-helpbrowser/opie-helpbrowser_1.1.8.bb b/packages/opie-fifteen/opie-fifteen_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-helpbrowser/opie-helpbrowser_1.1.8.bb
+++ b/packages/opie-fifteen/opie-fifteen_1.1.9.bb
diff --git a/packages/opie-homeapplet/opie-homeapplet_1.1.8.bb b/packages/opie-formatter/opie-formatter_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-homeapplet/opie-homeapplet_1.1.8.bb
+++ b/packages/opie-formatter/opie-formatter_1.1.9.bb
diff --git a/packages/opie-freetype/opie-freetype_1.1.8.bb b/packages/opie-freetype/opie-freetype_1.1.8.bb
deleted file mode 100644
index 9716201de4..0000000000
--- a/packages/opie-freetype/opie-freetype_1.1.8.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-DESCRIPTION = "Freetype fontfactory plugin"
-SECTION = "opie/fontfactories"
-PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
-LICENSE = "GPL"
-DEPENDS = "freetype"
-APPNAME = "freetypefactory"
-PR = "r1"
-
-TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
-
-SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/freetype"
-S = "${WORKDIR}/freetype"
-
-inherit opie
-
-EXTRA_QMAKEVARS_POST = "INCLUDEPATH+=${STAGING_INCDIR}/freetype2"
diff --git a/packages/opie-i18n/opie-lrelease-native_1.1.8.bb b/packages/opie-freetype/opie-freetype_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-i18n/opie-lrelease-native_1.1.8.bb
+++ b/packages/opie-freetype/opie-freetype_1.1.9.bb
diff --git a/packages/opie-ftp/opie-ftp_1.1.8.bb b/packages/opie-ftp/opie-ftp_1.1.8.bb
deleted file mode 100644
index 1b063b4c2c..0000000000
--- a/packages/opie-ftp/opie-ftp_1.1.8.bb
+++ /dev/null
@@ -1,25 +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"
-
-TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
-SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/opieftp \
-           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
-           ${HANDHELDS_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/packages/opie-i18n/opie-lupdate-native_1.1.8.bb b/packages/opie-ftp/opie-ftp_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-i18n/opie-lupdate-native_1.1.8.bb
+++ b/packages/opie-ftp/opie-ftp_1.1.9.bb
diff --git a/packages/opie-irc/opie-irc_1.1.8.bb b/packages/opie-ftplib/opie-ftplib_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-irc/opie-irc_1.1.8.bb
+++ b/packages/opie-ftplib/opie-ftplib_1.1.9.bb
diff --git a/packages/opie-irdaapplet/opie-irdaapplet_1.1.8.bb b/packages/opie-go/opie-go_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-irdaapplet/opie-irdaapplet_1.1.8.bb
+++ b/packages/opie-go/opie-go_1.1.9.bb
diff --git a/packages/opie-jumpx/opie-jumpx_1.1.8.bb b/packages/opie-gutenbrowser/opie-gutenbrowser_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-jumpx/opie-jumpx_1.1.8.bb
+++ b/packages/opie-gutenbrowser/opie-gutenbrowser_1.1.9.bb
diff --git a/packages/opie-kbill/opie-kbill_1.1.8.bb b/packages/opie-handwriting/opie-handwriting_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-kbill/opie-kbill_1.1.8.bb
+++ b/packages/opie-handwriting/opie-handwriting_1.1.9.bb
diff --git a/packages/opie-help-en/opie-help-en_1.1.8.bb b/packages/opie-help-en/opie-help-en_1.1.8.bb
deleted file mode 100644
index 03855646e2..0000000000
--- a/packages/opie-help-en/opie-help-en_1.1.8.bb
+++ /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' + bb.data.getVar('PV',d,1).replace('.', '_')}"
-SRC_URI = "${HANDHELDS_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\|patch")
-	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 = bb.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/packages/opie-kcheckers/opie-kcheckers_1.1.8.bb b/packages/opie-help-en/opie-help-en_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-kcheckers/opie-kcheckers_1.1.8.bb
+++ b/packages/opie-help-en/opie-help-en_1.1.9.bb
diff --git a/packages/opie-keyboard/opie-keyboard_1.1.8.bb b/packages/opie-helpbrowser/opie-helpbrowser_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-keyboard/opie-keyboard_1.1.8.bb
+++ b/packages/opie-helpbrowser/opie-helpbrowser_1.1.9.bb
diff --git a/packages/opie-keypebble/opie-keypebble_1.1.8.bb b/packages/opie-homeapplet/opie-homeapplet_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-keypebble/opie-keypebble_1.1.8.bb
+++ b/packages/opie-homeapplet/opie-homeapplet_1.1.9.bb
diff --git a/packages/opie-i18n/opie-i18n_1.1.8.bb b/packages/opie-i18n/opie-i18n_1.1.8.bb
deleted file mode 100644
index 336a162906..0000000000
--- a/packages/opie-i18n/opie-i18n_1.1.8.bb
+++ /dev/null
@@ -1,67 +0,0 @@
-DESCRIPTION = "Opie i18n files"
-SECTION = "opie/base"
-PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
-LICENSE = "GPL"
-DEPENDS = "opie-lrelease-native"
-
-TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
-SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/i18n \
-	   ${HANDHELDS_CVS};tag=${TAG};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/packages/opie-keyview/opie-keyview_1.1.8.bb b/packages/opie-i18n/opie-i18n_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-keyview/opie-keyview_1.1.8.bb
+++ b/packages/opie-i18n/opie-i18n_1.1.9.bb
diff --git a/packages/opie-kjumpx/opie-kjumpx_1.1.8.bb b/packages/opie-i18n/opie-lrelease-native_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-kjumpx/opie-kjumpx_1.1.8.bb
+++ b/packages/opie-i18n/opie-lrelease-native_1.1.9.bb
diff --git a/packages/opie-kpacman/opie-kpacman_1.1.8.bb b/packages/opie-i18n/opie-lupdate-native_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-kpacman/opie-kpacman_1.1.8.bb
+++ b/packages/opie-i18n/opie-lupdate-native_1.1.9.bb
diff --git a/packages/opie-language/opie-language_1.1.8.bb b/packages/opie-irc/opie-irc_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-language/opie-language_1.1.8.bb
+++ b/packages/opie-irc/opie-irc_1.1.9.bb
diff --git a/packages/opie-launcher-settings/opie-launcher-settings_1.1.8.bb b/packages/opie-irdaapplet/opie-irdaapplet_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-launcher-settings/opie-launcher-settings_1.1.8.bb
+++ b/packages/opie-irdaapplet/opie-irdaapplet_1.1.9.bb
diff --git a/packages/opie-libqrsync/opie-libqrsync_1.1.8.bb b/packages/opie-jumpx/opie-jumpx_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-libqrsync/opie-libqrsync_1.1.8.bb
+++ b/packages/opie-jumpx/opie-jumpx_1.1.9.bb
diff --git a/packages/opie-light-and-power/opie-light-and-power_1.1.8.bb b/packages/opie-kbill/opie-kbill_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-light-and-power/opie-light-and-power_1.1.8.bb
+++ b/packages/opie-kbill/opie-kbill_1.1.9.bb
diff --git a/packages/opie-lockapplet/opie-lockapplet_1.1.8.bb b/packages/opie-kcheckers/opie-kcheckers_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-lockapplet/opie-lockapplet_1.1.8.bb
+++ b/packages/opie-kcheckers/opie-kcheckers_1.1.9.bb
diff --git a/packages/opie-login/opie-login_1.1.8.bb b/packages/opie-keyboard/opie-keyboard_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-login/opie-login_1.1.8.bb
+++ b/packages/opie-keyboard/opie-keyboard_1.1.9.bb
diff --git a/packages/opie-logoutapplet/opie-logoutapplet_1.1.8.bb b/packages/opie-keypebble/opie-keypebble_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-logoutapplet/opie-logoutapplet_1.1.8.bb
+++ b/packages/opie-keypebble/opie-keypebble_1.1.9.bb
diff --git a/packages/opie-keytabs/opie-keytabs_1.1.8.bb b/packages/opie-keytabs/opie-keytabs_1.1.8.bb
deleted file mode 100644
index f08dfc5a91..0000000000
--- a/packages/opie-keytabs/opie-keytabs_1.1.8.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-DESCRIPTION = "Opie keytabs for terminal applications"
-SECTION = "opie/base"
-PRIORITY = "optional"
-LICENSE = "GPL"
-MAINTAINER = "Team Opie <opie-devel@handhelds.org>"
-DEPENDS = "virtual/libqpe"
-APPTYPE = "binary"
-PR = "r1"
-
-TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
-SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/etc "
-
-do_install() {
-        install -d ${D}${palmtopdir}/etc/keytabs/
-        install -m 0644 ${WORKDIR}/etc/keytabs/*.* ${D}${palmtopdir}/etc/keytabs/
-}
-
-FILES_${PN} = "${palmtopdir}/etc/keytabs/*"
diff --git a/packages/opie-mail/opie-mail_1.1.8.bb b/packages/opie-keytabs/opie-keytabs_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-mail/opie-mail_1.1.8.bb
+++ b/packages/opie-keytabs/opie-keytabs_1.1.9.bb
diff --git a/packages/opie-mailapplet/opie-mailapplet_1.1.8.bb b/packages/opie-keyview/opie-keyview_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-mailapplet/opie-mailapplet_1.1.8.bb
+++ b/packages/opie-keyview/opie-keyview_1.1.9.bb
diff --git a/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_1.1.8.bb b/packages/opie-kjumpx/opie-kjumpx_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_1.1.8.bb
+++ b/packages/opie-kjumpx/opie-kjumpx_1.1.9.bb
diff --git a/packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_1.1.8.bb b/packages/opie-kpacman/opie-kpacman_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_1.1.8.bb
+++ b/packages/opie-kpacman/opie-kpacman_1.1.9.bb
diff --git a/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_1.1.8.bb b/packages/opie-language/opie-language_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_1.1.8.bb
+++ b/packages/opie-language/opie-language_1.1.9.bb
diff --git a/packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_1.1.8.bb b/packages/opie-launcher-settings/opie-launcher-settings_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_1.1.8.bb
+++ b/packages/opie-launcher-settings/opie-launcher-settings_1.1.9.bb
diff --git a/packages/opie-mediaplayer1/opie-mediaplayer1_1.1.8.bb b/packages/opie-libqrsync/opie-libqrsync_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-mediaplayer1/opie-mediaplayer1_1.1.8.bb
+++ b/packages/opie-libqrsync/opie-libqrsync_1.1.9.bb
diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_1.1.8.bb b/packages/opie-light-and-power/opie-light-and-power_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_1.1.8.bb
+++ b/packages/opie-light-and-power/opie-light-and-power_1.1.9.bb
diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default_1.1.8.bb b/packages/opie-lockapplet/opie-lockapplet_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default_1.1.8.bb
+++ b/packages/opie-lockapplet/opie-lockapplet_1.1.9.bb
diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-pod_1.1.8.bb b/packages/opie-login/opie-login_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-pod_1.1.8.bb
+++ b/packages/opie-login/opie-login_1.1.9.bb
diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-techno_1.1.8.bb b/packages/opie-logoutapplet/opie-logoutapplet_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-techno_1.1.8.bb
+++ b/packages/opie-logoutapplet/opie-logoutapplet_1.1.9.bb
diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2_1.1.8.bb b/packages/opie-mail/opie-mail_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-mediaplayer2/opie-mediaplayer2_1.1.8.bb
+++ b/packages/opie-mail/opie-mail_1.1.9.bb
diff --git a/packages/opie-mediummount/opie-mediummount_1.1.8.bb b/packages/opie-mailapplet/opie-mailapplet_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-mediummount/opie-mediummount_1.1.8.bb
+++ b/packages/opie-mailapplet/opie-mailapplet_1.1.9.bb
diff --git a/packages/opie-mindbreaker/opie-mindbreaker_1.1.8.bb b/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-mindbreaker/opie-mindbreaker_1.1.8.bb
+++ b/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_1.1.9.bb
diff --git a/packages/opie-minesweep/opie-minesweep_1.1.8.bb b/packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-minesweep/opie-minesweep_1.1.8.bb
+++ b/packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_1.1.9.bb
diff --git a/packages/opie-mobilemsg/opie-mobilemsg_1.1.8.bb b/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-mobilemsg/opie-mobilemsg_1.1.8.bb
+++ b/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_1.1.9.bb
diff --git a/packages/opie-multikey/opie-multikey_1.1.8.bb b/packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-multikey/opie-multikey_1.1.8.bb
+++ b/packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_1.1.9.bb
diff --git a/packages/opie-multikeyapplet/opie-multikeyapplet_1.1.8.bb b/packages/opie-mediaplayer1/opie-mediaplayer1_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-multikeyapplet/opie-multikeyapplet_1.1.8.bb
+++ b/packages/opie-mediaplayer1/opie-mediaplayer1_1.1.9.bb
diff --git a/packages/opie-networkapplet/opie-networkapplet_1.1.8.bb b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-networkapplet/opie-networkapplet_1.1.8.bb
+++ b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_1.1.9.bb
diff --git a/packages/opie-notesapplet/opie-notesapplet_1.1.8.bb b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-notesapplet/opie-notesapplet_1.1.8.bb
+++ b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default_1.1.9.bb
diff --git a/packages/opie-odict/opie-odict_1.1.8.bb b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-pod_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-odict/opie-odict_1.1.8.bb
+++ b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-pod_1.1.9.bb
diff --git a/packages/opie-oyatzee/opie-oyatzee_1.1.8.bb b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-techno_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-oyatzee/opie-oyatzee_1.1.8.bb
+++ b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-techno_1.1.9.bb
diff --git a/packages/opie-packagemanager/opie-packagemanager_1.1.8.bb b/packages/opie-mediaplayer2/opie-mediaplayer2_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-packagemanager/opie-packagemanager_1.1.8.bb
+++ b/packages/opie-mediaplayer2/opie-mediaplayer2_1.1.9.bb
diff --git a/packages/opie-performance/opie-performance_1.1.8.bb b/packages/opie-mediummount/opie-mediummount_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-performance/opie-performance_1.1.8.bb
+++ b/packages/opie-mediummount/opie-mediummount_1.1.9.bb
diff --git a/packages/opie-memoryapplet/opie-memoryapplet_1.1.8.bb b/packages/opie-memoryapplet/opie-memoryapplet_1.1.8.bb
deleted file mode 100644
index cd55823aa9..0000000000
--- a/packages/opie-memoryapplet/opie-memoryapplet_1.1.8.bb
+++ /dev/null
@@ -1,36 +0,0 @@
-DESCRIPTION = "Memory Applet. \
-This applet displays the amount of free memory and manages the swap partition"
-SECTION = "opie/applets"
-PRIORITY = "optional"
-LICENSE = "GPL"
-PR = "r1"
-APPNAME = "memoryapplet"
-
-TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
-SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/applets/memoryapplet \
-           ${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/sysinfo \
-           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics"
-S = "${WORKDIR}/memoryapplet"
-
-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
-}
-
-do_install() {
-    install -d ${D}/${palmtopdir}/plugins/applets ${D}/${palmtopdir}/pics/memory/
-    install -m 0644 ${WORKDIR}/pics/memory/*.png ${D}/${palmtopdir}/pics/memory/
-    oe_libinstall -so libmemoryapplet ${D}/${palmtopdir}/plugins/applets/
-}
-
diff --git a/packages/opie-pickboard/opie-pickboard_1.1.8.bb b/packages/opie-memoryapplet/opie-memoryapplet_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-pickboard/opie-pickboard_1.1.8.bb
+++ b/packages/opie-memoryapplet/opie-memoryapplet_1.1.9.bb
diff --git a/packages/opie-pics/opie-pics_1.1.8.bb b/packages/opie-mindbreaker/opie-mindbreaker_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-pics/opie-pics_1.1.8.bb
+++ b/packages/opie-mindbreaker/opie-mindbreaker_1.1.9.bb
diff --git a/packages/opie-pimconverter/opie-pimconverter_1.1.8.bb b/packages/opie-minesweep/opie-minesweep_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-pimconverter/opie-pimconverter_1.1.8.bb
+++ b/packages/opie-minesweep/opie-minesweep_1.1.9.bb
diff --git a/packages/opie-powerchord/opie-powerchord_1.1.8.bb b/packages/opie-mobilemsg/opie-mobilemsg_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-powerchord/opie-powerchord_1.1.8.bb
+++ b/packages/opie-mobilemsg/opie-mobilemsg_1.1.9.bb
diff --git a/packages/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_1.1.8.bb b/packages/opie-multikey/opie-multikey_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_1.1.8.bb
+++ b/packages/opie-multikey/opie-multikey_1.1.9.bb
diff --git a/packages/opie-quicklauncher/opie-quicklauncher_1.1.8.bb b/packages/opie-multikeyapplet/opie-multikeyapplet_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-quicklauncher/opie-quicklauncher_1.1.8.bb
+++ b/packages/opie-multikeyapplet/opie-multikeyapplet_1.1.9.bb
diff --git a/packages/opie-rdesktop/opie-rdesktop_1.1.8.bb b/packages/opie-networkapplet/opie-networkapplet_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-rdesktop/opie-rdesktop_1.1.8.bb
+++ b/packages/opie-networkapplet/opie-networkapplet_1.1.9.bb
diff --git a/packages/opie-networksettings/opie-networksettings_1.1.8.bb b/packages/opie-networksettings/opie-networksettings_1.1.8.bb
deleted file mode 100644
index 679bbd1cbb..0000000000
--- a/packages/opie-networksettings/opie-networksettings_1.1.8.bb
+++ /dev/null
@@ -1,57 +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"
-PR = "r1"
-
-TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
-SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/networksettings \
-           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
-           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \
-	   ${HANDHELDS_CVS};tag=${TAG};module=opie/root"
-S = "${WORKDIR}/${APPNAME}"
-
-inherit opie
-
-PARALLEL_MAKE = ""
-
-EXTRA_QMAKEVARS_POST += "LIBS+=-L${S}"
-
-do_stage() {
-        oe_libinstall -so libinterfaces ${STAGING_LIBDIR}
-        install -d ${STAGING_INCDIR}/interfaces/
-        install -m 0644 interfaces/*.h ${STAGING_INCDIR}/interfaces/
-}
-
-do_install() {
-	# Create dir for changedns and the opie-kppp peer
-	install -d ${D}/${bindir}/
-	install -d ${D}/${sysconfdir}/
-	install -d ${D}/${sysconfdir}/ppp/
-	install -d ${D}/${sysconfdir}/ppp/peers/
-	
-	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
-
-	# install changedns script
-	install -m 0755 ${WORKDIR}/root/usr/bin/changedns ${D}${bindir}/
-	install -m 0644 ${WORKDIR}/root/etc/ppp/peers/opie-kppp ${D}${sysconfdir}/ppp/peers
-}
-
-PACKAGES =+ "opie-networksettings-pppplugin opie-networksettings-wlanplugin"
-FILES_${PN} += " ${bindir}/changedns "
-FILES_opie-networksettings-pppplugin = "${palmtopdir}/plugins/networksettings/libkppp.so ${sysconfdir}/ppp/peers/opie-kppp"
-FILES_opie-networksettings-wlanplugin = "${palmtopdir}/plugins/networksettings/libwlan.so"
-
diff --git a/packages/opie-recorder/opie-recorder_1.1.8.bb b/packages/opie-networksettings/opie-networksettings_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-recorder/opie-recorder_1.1.8.bb
+++ b/packages/opie-networksettings/opie-networksettings_1.1.9.bb
diff --git a/packages/opie-remote/opie-remote_1.1.8.bb b/packages/opie-notesapplet/opie-notesapplet_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-remote/opie-remote_1.1.8.bb
+++ b/packages/opie-notesapplet/opie-notesapplet_1.1.9.bb
diff --git a/packages/opie-restartapplet/opie-restartapplet2_1.1.8.bb b/packages/opie-odict/opie-odict_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-restartapplet/opie-restartapplet2_1.1.8.bb
+++ b/packages/opie-odict/opie-odict_1.1.9.bb
diff --git a/packages/opie-restartapplet/opie-restartapplet_1.1.8.bb b/packages/opie-oyatzee/opie-oyatzee_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-restartapplet/opie-restartapplet_1.1.8.bb
+++ b/packages/opie-oyatzee/opie-oyatzee_1.1.9.bb
diff --git a/packages/opie-restartapplet2/opie-restartapplet2_1.1.8.bb b/packages/opie-packagemanager/opie-packagemanager_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-restartapplet2/opie-restartapplet2_1.1.8.bb
+++ b/packages/opie-packagemanager/opie-packagemanager_1.1.9.bb
diff --git a/packages/opie-parashoot/opie-parashoot_1.1.8.bb b/packages/opie-parashoot/opie-parashoot_1.1.8.bb
deleted file mode 100644
index 497d2d9823..0000000000
--- a/packages/opie-parashoot/opie-parashoot_1.1.8.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-DESCRIPTION = "Game: shoot the parachutists"
-SECTION = "opie/games"
-PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
-LICENSE = "GPL"
-PR = "r1"
-
-APPNAME = "parashoot"
-
-TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
-SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/parashoot \
-           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
-           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
-
-S = "${WORKDIR}/${APPNAME}"
-
-inherit opie
-
-# FILES plugins/application/libparashoot.so* bin/parashoot apps/Games/parashoot.desktop pics/parashoot
-do_install() {
-        install -d ${D}${palmtopdir}/pics/${APPNAME}/
-        install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
-        install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.xpm ${D}${palmtopdir}/pics/${APPNAME}/
-}
-
diff --git a/packages/opie-rotateapplet/opie-rotateapplet_1.1.8.bb b/packages/opie-parashoot/opie-parashoot_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-rotateapplet/opie-rotateapplet_1.1.8.bb
+++ b/packages/opie-parashoot/opie-parashoot_1.1.9.bb
diff --git a/packages/opie-screenshotapplet/opie-screenshotapplet_1.1.8.bb b/packages/opie-performance/opie-performance_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-screenshotapplet/opie-screenshotapplet_1.1.8.bb
+++ b/packages/opie-performance/opie-performance_1.1.9.bb
diff --git a/packages/opie-search/opie-search_1.1.8.bb b/packages/opie-pickboard/opie-pickboard_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-search/opie-search_1.1.8.bb
+++ b/packages/opie-pickboard/opie-pickboard_1.1.9.bb
diff --git a/packages/opie-security/opie-security_1.1.8.bb b/packages/opie-pics/opie-pics_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-security/opie-security_1.1.8.bb
+++ b/packages/opie-pics/opie-pics_1.1.9.bb
diff --git a/packages/opie-sfcave/opie-sfcave_1.1.8.bb b/packages/opie-pimconverter/opie-pimconverter_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-sfcave/opie-sfcave_1.1.8.bb
+++ b/packages/opie-pimconverter/opie-pimconverter_1.1.9.bb
diff --git a/packages/opie-sh/opie-sh_1.1.8.bb b/packages/opie-powerchord/opie-powerchord_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-sh/opie-sh_1.1.8.bb
+++ b/packages/opie-powerchord/opie-powerchord_1.1.9.bb
diff --git a/packages/opie-sheet/opie-sheet_1.1.8.bb b/packages/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-sheet/opie-sheet_1.1.8.bb
+++ b/packages/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_1.1.9.bb
diff --git a/packages/opie-qasteroids/opie-qasteroids_1.1.8.bb b/packages/opie-qasteroids/opie-qasteroids_1.1.8.bb
deleted file mode 100644
index ac4f2abcd2..0000000000
--- a/packages/opie-qasteroids/opie-qasteroids_1.1.8.bb
+++ /dev/null
@@ -1,30 +0,0 @@
-DESCRIPTION = "Game: shoot the asteroids"
-SECTION = "opie/games"
-PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
-LICENSE = "GPL"
-PR = "r1"
-
-APPNAME = "qasteroids"
-
-TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
-SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/qasteroids \
-           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
-           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
-
-S = "${WORKDIR}/${APPNAME}"
-
-inherit opie
-
-# FILES plugins/application/libqasteroids.so* bin/qasteroids apps/Games/qasteroids.desktop pics/qasteroids/*
-do_install() {
-        install -d ${D}${palmtopdir}/pics/${APPNAME}/
-        install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
-
-	for dir in bits  exhaust  missile  powerups  rock2  rock3  shield  ship
-	do
-	    install -d ${D}${palmtopdir}/pics/${APPNAME}/$dir/
-	    install -m 0644 ${WORKDIR}/pics/${APPNAME}/$dir/*.png ${D}${palmtopdir}/pics/${APPNAME}/$dir/
-	done
-}
-
diff --git a/packages/opie-showimg/opie-showimg_1.1.8.bb b/packages/opie-qasteroids/opie-qasteroids_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-showimg/opie-showimg_1.1.8.bb
+++ b/packages/opie-qasteroids/opie-qasteroids_1.1.9.bb
diff --git a/packages/opie-snake/opie-snake_1.1.8.bb b/packages/opie-quicklauncher/opie-quicklauncher_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-snake/opie-snake_1.1.8.bb
+++ b/packages/opie-quicklauncher/opie-quicklauncher_1.1.9.bb
diff --git a/packages/opie-solitaire/opie-solitaire_1.1.8.bb b/packages/opie-rdesktop/opie-rdesktop_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-solitaire/opie-solitaire_1.1.8.bb
+++ b/packages/opie-rdesktop/opie-rdesktop_1.1.9.bb
diff --git a/packages/opie-reader/opie-reader_1.1.8.bb b/packages/opie-reader/opie-reader_1.1.8.bb
deleted file mode 100644
index 8a578d762c..0000000000
--- a/packages/opie-reader/opie-reader_1.1.8.bb
+++ /dev/null
@@ -1,44 +0,0 @@
-DESCRIPTION = "E-Book reader"
-SECTION = "opie/applications"
-PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
-LICENSE = "GPL"
-
-APPNAME = "opie-reader"
-APPTYPE = "binary"
-
-TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
-SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/opie-reader \
-           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
-           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
-
-S = "${WORKDIR}/opie-reader"
-
-EXTRA_QMAKEVARS_POST += "LIBS+=-L${S}"
-PARALLEL_MAKE = ""
-
-inherit opie
-
-# FILES bin/opie-reader apps/Applications/opie-reader.desktop pics/opie-reader/*
-do_install() {
-        install -d ${D}${palmtopdir}/pics/${APPNAME}/ \ 
-                   ${D}${palmtopdir}/lib/ \
-                   ${D}${palmtopdir}/plugins/reader/data/ \
-				   ${D}${palmtopdir}/plugins/reader/filters/ \
-                   ${D}${palmtopdir}/plugins/reader/codecs/ 
-        install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
-
-		for f in libAportis libPlucker libppms libCHM libWeasel libiSilo   
-		do
-			oe_libinstall -so -C ${S}/ $f ${D}/${palmtopdir}/plugins/reader/codecs/
-		done
-
-		for f in libreader_codec libreader_pdb libreader_pluckerbase
-		do
-			oe_libinstall -so -C ${S}/ $f ${D}/${palmtopdir}/lib/
-		done
-		oe_libinstall -so -C ${S}/ libHTMLfilter ${D}/${palmtopdir}/plugins/reader/filters/
-		install -m 0644 ${S}/HTMLentities ${D}/${palmtopdir}/plugins/reader/data/
-		
-}
-
diff --git a/packages/opie-sshkeys/opie-sshkeys_1.1.8.bb b/packages/opie-reader/opie-reader_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-sshkeys/opie-sshkeys_1.1.8.bb
+++ b/packages/opie-reader/opie-reader_1.1.9.bb
diff --git a/packages/opie-style-flat/opie-style-flat_1.1.8.bb b/packages/opie-recorder/opie-recorder_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-style-flat/opie-style-flat_1.1.8.bb
+++ b/packages/opie-recorder/opie-recorder_1.1.9.bb
diff --git a/packages/opie-style-fresh/opie-style-fresh_1.1.8.bb b/packages/opie-remote/opie-remote_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-style-fresh/opie-style-fresh_1.1.8.bb
+++ b/packages/opie-remote/opie-remote_1.1.9.bb
diff --git a/packages/opie-style-liquid/opie-style-liquid_1.1.8.bb b/packages/opie-restartapplet/opie-restartapplet2_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-style-liquid/opie-style-liquid_1.1.8.bb
+++ b/packages/opie-restartapplet/opie-restartapplet2_1.1.9.bb
diff --git a/packages/opie-style-metal/opie-style-metal_1.1.8.bb b/packages/opie-restartapplet/opie-restartapplet_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-style-metal/opie-style-metal_1.1.8.bb
+++ b/packages/opie-restartapplet/opie-restartapplet_1.1.9.bb
diff --git a/packages/opie-style-phase/opie-style-phase_1.1.8.bb b/packages/opie-restartapplet2/opie-restartapplet2_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-style-phase/opie-style-phase_1.1.8.bb
+++ b/packages/opie-restartapplet2/opie-restartapplet2_1.1.9.bb
diff --git a/packages/opie-style-web/opie-style-web_1.1.8.bb b/packages/opie-rotateapplet/opie-rotateapplet_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-style-web/opie-style-web_1.1.8.bb
+++ b/packages/opie-rotateapplet/opie-rotateapplet_1.1.9.bb
diff --git a/packages/opie-suspendapplet/opie-suspendapplet_1.1.8.bb b/packages/opie-screenshotapplet/opie-screenshotapplet_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-suspendapplet/opie-suspendapplet_1.1.8.bb
+++ b/packages/opie-screenshotapplet/opie-screenshotapplet_1.1.9.bb
diff --git a/packages/opie-symlinker/opie-symlinker_1.1.8.bb b/packages/opie-search/opie-search_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-symlinker/opie-symlinker_1.1.8.bb
+++ b/packages/opie-search/opie-search_1.1.9.bb
diff --git a/packages/opie-sysinfo/opie-sysinfo_1.1.8.bb b/packages/opie-security/opie-security_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-sysinfo/opie-sysinfo_1.1.8.bb
+++ b/packages/opie-security/opie-security_1.1.9.bb
diff --git a/packages/opie-securityplugins/opie-securityplugin-blueping_1.1.8.bb b/packages/opie-securityplugins/opie-securityplugin-blueping_1.1.8.bb
deleted file mode 100644
index 525ee95a3b..0000000000
--- a/packages/opie-securityplugins/opie-securityplugin-blueping_1.1.8.bb
+++ /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/security"
-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' + bb.data.getVar('PV',d,1).replace('.', '_')}"
-SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/securityplugins/blueping \
-           ${HANDHELDS_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/packages/opie-systemtime/opie-systemtime_1.1.8.bb b/packages/opie-securityplugins/opie-securityplugin-blueping_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-systemtime/opie-systemtime_1.1.8.bb
+++ b/packages/opie-securityplugins/opie-securityplugin-blueping_1.1.9.bb
diff --git a/packages/opie-securityplugins/opie-securityplugin-dummy_1.1.8.bb b/packages/opie-securityplugins/opie-securityplugin-dummy_1.1.8.bb
deleted file mode 100644
index cc5c7bb229..0000000000
--- a/packages/opie-securityplugins/opie-securityplugin-dummy_1.1.8.bb
+++ /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/security"
-PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
-LICENSE = "GPL"
-I18N_FILES = "libmultiauthdummyplugin.ts"
-RDEPENDS = "opie-security"
-PR = "r1"
-
-APPNAME = "multiauthdummyplugin"
-
-TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
-SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/securityplugins/dummy \
-           ${HANDHELDS_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/packages/opie-tableviewer/opie-tableviewer_1.1.8.bb b/packages/opie-securityplugins/opie-securityplugin-dummy_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-tableviewer/opie-tableviewer_1.1.8.bb
+++ b/packages/opie-securityplugins/opie-securityplugin-dummy_1.1.9.bb
diff --git a/packages/opie-securityplugins/opie-securityplugin-notice_1.1.8.bb b/packages/opie-securityplugins/opie-securityplugin-notice_1.1.8.bb
deleted file mode 100644
index c0b01de4e6..0000000000
--- a/packages/opie-securityplugins/opie-securityplugin-notice_1.1.8.bb
+++ /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/security"
-PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
-LICENSE = "GPL"
-I18N_FILES = "libmultiauthnoticeplugin.ts"
-RDEPENDS = "opie-security"
-PR = "r1"
-
-APPNAME = "multiauthnoticeplugin"
-
-TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
-SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/securityplugins/notice \
-           ${HANDHELDS_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/packages/opie-tabmanager/opie-tabmanager_1.1.8.bb b/packages/opie-securityplugins/opie-securityplugin-notice_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-tabmanager/opie-tabmanager_1.1.8.bb
+++ b/packages/opie-securityplugins/opie-securityplugin-notice_1.1.9.bb
diff --git a/packages/opie-securityplugins/opie-securityplugin-pin_1.1.8.bb b/packages/opie-securityplugins/opie-securityplugin-pin_1.1.8.bb
deleted file mode 100644
index 5a3bbd14ce..0000000000
--- a/packages/opie-securityplugins/opie-securityplugin-pin_1.1.8.bb
+++ /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/security"
-PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
-LICENSE = "GPL"
-I18N_FILES = "libmultiauthpinplugin.ts"
-RDEPENDS = "opie-security"
-PR = "r1"
-
-APPNAME = "multiauthpinplugin"
-
-TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
-SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/securityplugins/pin \
-           ${HANDHELDS_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/packages/opie-taskbar/opie-taskbar/server.pro-1.1.8 b/packages/opie-securityplugins/opie-securityplugin-pin_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-taskbar/opie-taskbar/server.pro-1.1.8
+++ b/packages/opie-securityplugins/opie-securityplugin-pin_1.1.9.bb
diff --git a/packages/opie-tetrix/opie-tetrix_1.1.8.bb b/packages/opie-sfcave/opie-sfcave_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-tetrix/opie-tetrix_1.1.8.bb
+++ b/packages/opie-sfcave/opie-sfcave_1.1.9.bb
diff --git a/packages/opie-textedit/opie-textedit_1.1.8.bb b/packages/opie-sh/opie-sh_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-textedit/opie-textedit_1.1.8.bb
+++ b/packages/opie-sh/opie-sh_1.1.9.bb
diff --git a/packages/opie-theme/opie-theme_1.1.8.bb b/packages/opie-sheet/opie-sheet_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-theme/opie-theme_1.1.8.bb
+++ b/packages/opie-sheet/opie-sheet_1.1.9.bb
diff --git a/packages/opie-tictac/opie-tictac_1.1.8.bb b/packages/opie-showimg/opie-showimg_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-tictac/opie-tictac_1.1.8.bb
+++ b/packages/opie-showimg/opie-showimg_1.1.9.bb
diff --git a/packages/opie-today-addressbookplugin/opie-today-addressbookplugin_1.1.8.bb b/packages/opie-snake/opie-snake_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-today-addressbookplugin/opie-today-addressbookplugin_1.1.8.bb
+++ b/packages/opie-snake/opie-snake_1.1.9.bb
diff --git a/packages/opie-today-datebookplugin/opie-today-datebookplugin_1.1.8.bb b/packages/opie-solitaire/opie-solitaire_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-today-datebookplugin/opie-today-datebookplugin_1.1.8.bb
+++ b/packages/opie-solitaire/opie-solitaire_1.1.9.bb
diff --git a/packages/opie-sounds/opie-sounds_1.1.8.bb b/packages/opie-sounds/opie-sounds_1.1.8.bb
deleted file mode 100644
index b02434f001..0000000000
--- a/packages/opie-sounds/opie-sounds_1.1.8.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-DESCRIPTION = "Common Opie Sounds"
-SECTION = "opie/base"
-PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
-LICENSE = "GPL"
-
-TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
-SRC_URI = "${HANDHELDS_CVS};module=opie/sounds;tag=${TAG}"
-S = "${WORKDIR}/sounds"
-
-SOUNDS = "alarm touchsound keysound"
-
-do_install() {
-	install -d ${D}${palmtopdir}/sounds/
-	for i in ${SOUNDS}
-	do
-		install $i.wav ${D}${palmtopdir}/sounds/$i.wav
-	done
-}
-
-FILES_${PN} = "${palmtopdir}"
diff --git a/packages/opie-today-fortuneplugin/opie-today-fortuneplugin_1.1.8.bb b/packages/opie-sounds/opie-sounds_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-today-fortuneplugin/opie-today-fortuneplugin_1.1.8.bb
+++ b/packages/opie-sounds/opie-sounds_1.1.9.bb
diff --git a/packages/opie-today-mailplugin/opie-today-mailplugin_1.1.8.bb b/packages/opie-sshkeys/opie-sshkeys_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-today-mailplugin/opie-today-mailplugin_1.1.8.bb
+++ b/packages/opie-sshkeys/opie-sshkeys_1.1.9.bb
diff --git a/packages/opie-today-stocktickerplugin/opie-today-stocktickerplugin_1.1.8.bb b/packages/opie-style-flat/opie-style-flat_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-today-stocktickerplugin/opie-today-stocktickerplugin_1.1.8.bb
+++ b/packages/opie-style-flat/opie-style-flat_1.1.9.bb
diff --git a/packages/opie-today-todolistplugin/opie-today-todolistplugin_1.1.8.bb b/packages/opie-style-fresh/opie-style-fresh_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-today-todolistplugin/opie-today-todolistplugin_1.1.8.bb
+++ b/packages/opie-style-fresh/opie-style-fresh_1.1.9.bb
diff --git a/packages/opie-today-weatherplugin/opie-today-weatherplugin_1.1.8.bb b/packages/opie-style-liquid/opie-style-liquid_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-today-weatherplugin/opie-today-weatherplugin_1.1.8.bb
+++ b/packages/opie-style-liquid/opie-style-liquid_1.1.9.bb
diff --git a/packages/opie-today/opie-today_1.1.8.bb b/packages/opie-style-metal/opie-style-metal_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-today/opie-today_1.1.8.bb
+++ b/packages/opie-style-metal/opie-style-metal_1.1.9.bb
diff --git a/packages/opie-todo/opie-todo_1.1.8.bb b/packages/opie-style-phase/opie-style-phase_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-todo/opie-todo_1.1.8.bb
+++ b/packages/opie-style-phase/opie-style-phase_1.1.9.bb
diff --git a/packages/opie-tonleiter/opie-tonleiter_1.1.8.bb b/packages/opie-style-web/opie-style-web_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-tonleiter/opie-tonleiter_1.1.8.bb
+++ b/packages/opie-style-web/opie-style-web_1.1.9.bb
diff --git a/packages/opie-unikeyboard/opie-unikeyboard_1.1.8.bb b/packages/opie-suspendapplet/opie-suspendapplet_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-unikeyboard/opie-unikeyboard_1.1.8.bb
+++ b/packages/opie-suspendapplet/opie-suspendapplet_1.1.9.bb
diff --git a/packages/opie-usermanager/opie-usermanager_1.1.8.bb b/packages/opie-symlinker/opie-symlinker_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-usermanager/opie-usermanager_1.1.8.bb
+++ b/packages/opie-symlinker/opie-symlinker_1.1.9.bb
diff --git a/packages/opie-vmemo-settings/opie-vmemo-settings_1.1.8.bb b/packages/opie-sysinfo/opie-sysinfo_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-vmemo-settings/opie-vmemo-settings_1.1.8.bb
+++ b/packages/opie-sysinfo/opie-sysinfo_1.1.9.bb
diff --git a/packages/opie-vmemo/opie-vmemo_1.1.8.bb b/packages/opie-systemtime/opie-systemtime_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-vmemo/opie-vmemo_1.1.8.bb
+++ b/packages/opie-systemtime/opie-systemtime_1.1.9.bb
diff --git a/packages/opie-volumeapplet/opie-volumeapplet_1.1.8.bb b/packages/opie-tableviewer/opie-tableviewer_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-volumeapplet/opie-volumeapplet_1.1.8.bb
+++ b/packages/opie-tableviewer/opie-tableviewer_1.1.9.bb
diff --git a/packages/opie-vtapplet/opie-vtapplet_1.1.8.bb b/packages/opie-tabmanager/opie-tabmanager_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-vtapplet/opie-vtapplet_1.1.8.bb
+++ b/packages/opie-tabmanager/opie-tabmanager_1.1.9.bb
diff --git a/packages/opie-wordgame/opie-wordgame_1.1.8.bb b/packages/opie-taskbar/opie-taskbar/server.pro-1.1.9
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-wordgame/opie-wordgame_1.1.8.bb
+++ b/packages/opie-taskbar/opie-taskbar/server.pro-1.1.9
diff --git a/packages/opie-taskbar/opie-taskbar_1.1.8.bb b/packages/opie-taskbar/opie-taskbar_1.1.8.bb
deleted file mode 100644
index 3ca5b2902b..0000000000
--- a/packages/opie-taskbar/opie-taskbar_1.1.8.bb
+++ /dev/null
@@ -1,133 +0,0 @@
-DESCRIPTION = "Opie Launcher and Taskbar"
-SECTION = "opie/base"
-PRIORITY = "optional"
-LICENSE = "GPL"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
-DEPENDS = "opie-libqrsync"
-PR = "r3"
-APPNAME = "qpe"
-
-TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
-SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/calibrate \
-           ${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/mediummount \
-           ${HANDHELDS_CVS};tag=${TAG};module=opie/core/launcher \
-           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
-           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \
-           ${HANDHELDS_CVS};tag=${TAG};module=opie/root \
-           ${HANDHELDS_CVS};tag=${TAG};module=opie/etc \
-	   file://nomax.patch;patch=1;pnum=3 \
-           file://server.pro-1.1.8 \
-           file://opie-reorgfiles \
-           file://opie \
-           file://qpe.conf \
-	   file://opie_defaults"
-
-S = "${WORKDIR}/launcher"
-
-CXXFLAGS_append_husky = " -DOPIE_NO_WINDOWED "
-CXXFLAGS_append_corgi = " -DOPIE_NO_WINDOWED "
-CXXFLAGS_append_shepherd = " -DOPIE_NO_WINDOWED "
-CXXFLAGS_append_tosa = " -DOPIE_NO_WINDOWED "
-
-# 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.8 ${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}/etc/profile.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/
-	install -m 0644 ${WORKDIR}/opie_defaults ${D}/etc/profile.d/
-
-	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 /etc/profile.d ${palmtopdir}/apps ${palmtopdir}/pics"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/packages/opie-write/opie-write_1.1.8.bb b/packages/opie-taskbar/opie-taskbar_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-write/opie-write_1.1.8.bb
+++ b/packages/opie-taskbar/opie-taskbar_1.1.9.bb
diff --git a/packages/opie-zkbapplet/opie-zkbapplet_1.1.8.bb b/packages/opie-tetrix/opie-tetrix_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-zkbapplet/opie-zkbapplet_1.1.8.bb
+++ b/packages/opie-tetrix/opie-tetrix_1.1.9.bb
diff --git a/packages/opie-zlines/opie-zlines_1.1.8.bb b/packages/opie-textedit/opie-textedit_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-zlines/opie-zlines_1.1.8.bb
+++ b/packages/opie-textedit/opie-textedit_1.1.9.bb
diff --git a/packages/opie-zsame/opie-zsame_1.1.8.bb b/packages/opie-theme/opie-theme_1.1.9.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-zsame/opie-zsame_1.1.8.bb
+++ b/packages/opie-theme/opie-theme_1.1.9.bb
diff --git a/packages/opie-tictac/opie-tictac_1.1.9.bb b/packages/opie-tictac/opie-tictac_1.1.9.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/opie-tictac/opie-tictac_1.1.9.bb
diff --git a/packages/opie-tinykate/opie-tinykate_1.1.8.bb b/packages/opie-tinykate/opie-tinykate_1.1.8.bb
deleted file mode 100644
index daa8017390..0000000000
--- a/packages/opie-tinykate/opie-tinykate_1.1.8.bb
+++ /dev/null
@@ -1,48 +0,0 @@
-DESCRIPTION = "The Kate Text Editor for Opie"
-SECTION = "opie/applications"
-PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
-LICENSE = "GPL"
-DEPENDS = "libqtaux2"
-
-APPNAME = "tinykate"
-
-TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
-SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/tinykate \
-           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
-           ${HANDHELDS_CVS};tag=${TAG};module=opie/share \
-           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
-
-S = "${WORKDIR}/tinykate"
-
-inherit opie
-
-EXTRA_QMAKEVARS_POST += " LIBS+=-L.."
-PARALLEL_MAKE = ""
-
-# FILES plugins/application/libkate.so* bin/kate apps/Applications/tinykate.desktop pics/tinykate lib/libtinykate.so*
-do_install() {
-	install -d ${D}${palmtopdir}/lib/
-	oe_soinstall libkate.so.1.0.0 ${D}${palmtopdir}/lib/
-        install -d ${D}${palmtopdir}/pics/${APPNAME}/
-        install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
-	install -d ${D}${palmtopdir}/share/${APPNAME}/syntax/
-	install -m 0644 ${WORKDIR}/share/${APPNAME}/syntax/*.* ${D}${palmtopdir}/share/${APPNAME}/syntax/
-}
-
-PACKAGES = " \
-	opie-tinykate-syntax-commondev \
-	opie-tinykate-syntax-documentation \
-	opie-tinykate-syntax-misc \
-	opie-tinykate-syntax-miscdev \
-	opie-tinykate-syntax-unix \
-	opie-tinykate-syntax-web \
-	opie-tinykate "
-
-
-FILES_opie-tinykate-syntax-commondev = " ${palmtopdir}/share/tinykate/syntax/c.xml ${palmtopdir}/share/tinykate/syntax/cpp.xml ${palmtopdir}/share/tinykate/syntax/gnuassembler.xml ${palmtopdir}/share/tinykate/syntax/kbasic.xml ${palmtopdir}/share/tinykate/syntax/pascal.xml ${palmtopdir}/share/tinykate/syntax/perl.xml ${palmtopdir}/share/tinykate/syntax/php.xml ${palmtopdir}/share/tinykate/syntax/python.xml ${palmtopdir}/share/tinykate/syntax/ruby.xml ${palmtopdir}/share/tinykate/syntax/sql.xml ${palmtopdir}/share/tinykate/syntax/tcl.xml ${palmtopdir}/share/tinykate/syntax/xml.xml ${palmtopdir}/share/tinykate/syntax/xmldebug.xml ${palmtopdir}/share/tinykate/syntax/java.xml"
-FILES_opie-tinykate-syntax-documentation = " ${palmtopdir}/share/tinykate/syntax/latex.xml ${palmtopdir}/share/tinykate/syntax/postscript.xml ${palmtopdir}/share/tinykate/syntax/sgml.xml"
-FILES_opie-tinykate-syntax-misc = " ${palmtopdir}/share/tinykate/syntax/idconsole.xml ${palmtopdir}/share/tinykate/syntax/matlab.xml ${palmtopdir}/share/tinykate/syntax/verilog.xml ${palmtopdir}/share/tinykate/syntax/vhdl.xml"
-FILES_opie-tinykate-syntax-miscdev = " ${palmtopdir}/share/tinykate/syntax/ada.xml ${palmtopdir}/share/tinykate/syntax/eiffel.xml ${palmtopdir}/share/tinykate/syntax/ferite.xml ${palmtopdir}/share/tinykate/syntax/fortran.xml ${palmtopdir}/share/tinykate/syntax/haskell.xml ${palmtopdir}/share/tinykate/syntax/literate-haskell.xml ${palmtopdir}/share/tinykate/syntax/objectivec.xml ${palmtopdir}/share/tinykate/syntax/sather.xml ${palmtopdir}/share/tinykate/syntax/scheme.xml"
-FILES_opie-tinykate-syntax-unix = " ${palmtopdir}/share/tinykate/syntax/cs.xml ${palmtopdir}/share/tinykate/syntax/bash.xml ${palmtopdir}/share/tinykate/syntax/changelog.xml ${palmtopdir}/share/tinykate/syntax/desktop.xml ${palmtopdir}/share/tinykate/syntax/diff.xml ${palmtopdir}/share/tinykate/syntax/mab.xml ${palmtopdir}/share/tinykate/syntax/makefile.xml ${palmtopdir}/share/tinykate/syntax/rpmspec.xml ${palmtopdir}/share/tinykate/syntax/sml.xml ${palmtopdir}/share/tinykate/syntax/winehq.xml"
-FILES_opie-tinykate-syntax-web = " ${palmtopdir}/share/tinykate/syntax/css.xml ${palmtopdir}/share/tinykate/syntax/html.xml ${palmtopdir}/share/tinykate/syntax/javascript.xml"
diff --git a/packages/opie-tinykate/opie-tinykate_1.1.9.bb b/packages/opie-tinykate/opie-tinykate_1.1.9.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/opie-tinykate/opie-tinykate_1.1.9.bb
diff --git a/packages/opie-today-addressbookplugin/opie-today-addressbookplugin_1.1.9.bb b/packages/opie-today-addressbookplugin/opie-today-addressbookplugin_1.1.9.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/opie-today-addressbookplugin/opie-today-addressbookplugin_1.1.9.bb
diff --git a/packages/opie-today-datebookplugin/opie-today-datebookplugin_1.1.9.bb b/packages/opie-today-datebookplugin/opie-today-datebookplugin_1.1.9.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/opie-today-datebookplugin/opie-today-datebookplugin_1.1.9.bb
diff --git a/packages/opie-today-fortuneplugin/opie-today-fortuneplugin_1.1.9.bb b/packages/opie-today-fortuneplugin/opie-today-fortuneplugin_1.1.9.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/opie-today-fortuneplugin/opie-today-fortuneplugin_1.1.9.bb
diff --git a/packages/opie-today-mailplugin/opie-today-mailplugin_1.1.9.bb b/packages/opie-today-mailplugin/opie-today-mailplugin_1.1.9.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/opie-today-mailplugin/opie-today-mailplugin_1.1.9.bb
diff --git a/packages/opie-today-stocktickerplugin/opie-today-stocktickerplugin_1.1.9.bb b/packages/opie-today-stocktickerplugin/opie-today-stocktickerplugin_1.1.9.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/opie-today-stocktickerplugin/opie-today-stocktickerplugin_1.1.9.bb
diff --git a/packages/opie-today-todolistplugin/opie-today-todolistplugin_1.1.9.bb b/packages/opie-today-todolistplugin/opie-today-todolistplugin_1.1.9.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/opie-today-todolistplugin/opie-today-todolistplugin_1.1.9.bb
diff --git a/packages/opie-today-weatherplugin/opie-today-weatherplugin_1.1.9.bb b/packages/opie-today-weatherplugin/opie-today-weatherplugin_1.1.9.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/opie-today-weatherplugin/opie-today-weatherplugin_1.1.9.bb
diff --git a/packages/opie-today/opie-today_1.1.9.bb b/packages/opie-today/opie-today_1.1.9.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/opie-today/opie-today_1.1.9.bb
diff --git a/packages/opie-todo/opie-todo_1.1.9.bb b/packages/opie-todo/opie-todo_1.1.9.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/opie-todo/opie-todo_1.1.9.bb
diff --git a/packages/opie-tonleiter/opie-tonleiter_1.1.9.bb b/packages/opie-tonleiter/opie-tonleiter_1.1.9.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/opie-tonleiter/opie-tonleiter_1.1.9.bb
diff --git a/packages/opie-unikeyboard/opie-unikeyboard_1.1.9.bb b/packages/opie-unikeyboard/opie-unikeyboard_1.1.9.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/opie-unikeyboard/opie-unikeyboard_1.1.9.bb
diff --git a/packages/opie-usermanager/opie-usermanager_1.1.9.bb b/packages/opie-usermanager/opie-usermanager_1.1.9.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/opie-usermanager/opie-usermanager_1.1.9.bb
diff --git a/packages/opie-vmemo-settings/opie-vmemo-settings_1.1.9.bb b/packages/opie-vmemo-settings/opie-vmemo-settings_1.1.9.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/opie-vmemo-settings/opie-vmemo-settings_1.1.9.bb
diff --git a/packages/opie-vmemo/opie-vmemo_1.1.9.bb b/packages/opie-vmemo/opie-vmemo_1.1.9.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/opie-vmemo/opie-vmemo_1.1.9.bb
diff --git a/packages/opie-volumeapplet/opie-volumeapplet_1.1.9.bb b/packages/opie-volumeapplet/opie-volumeapplet_1.1.9.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/opie-volumeapplet/opie-volumeapplet_1.1.9.bb
diff --git a/packages/opie-vtapplet/opie-vtapplet_1.1.9.bb b/packages/opie-vtapplet/opie-vtapplet_1.1.9.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/opie-vtapplet/opie-vtapplet_1.1.9.bb
diff --git a/packages/opie-wirelessapplet/opie-wirelessapplet_1.1.8.bb b/packages/opie-wirelessapplet/opie-wirelessapplet_1.1.8.bb
deleted file mode 100644
index 353bba3a6a..0000000000
--- a/packages/opie-wirelessapplet/opie-wirelessapplet_1.1.8.bb
+++ /dev/null
@@ -1,31 +0,0 @@
-DESCRIPTION = "Wireless Applet"
-SECTION = "opie/applets"
-PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
-LICENSE = "GPL"
-APPNAME = "wirelessapplet"
-
-EXCLUDE_FROM_WORLD = "1"
-
-TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
-SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/applets/wirelessapplet"
-S = "${WORKDIR}/${APPNAME}"
-
-inherit opie
-
-pkg_postinst() {
-#!/bin/sh
-if [ -n "$D" ]; then exit 1; fi
-if pidof -s qpe >/dev/null; then
-  /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
-else
-  exit 0
-fi
-}
-
-pkg_postrm() {
-#!/bin/sh
-if [ -n "$D" ]; then exit 1; fi
-/opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
-}
-
diff --git a/packages/opie-wirelessapplet/opie-wirelessapplet_1.1.9.bb b/packages/opie-wirelessapplet/opie-wirelessapplet_1.1.9.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/opie-wirelessapplet/opie-wirelessapplet_1.1.9.bb
diff --git a/packages/opie-wordgame/opie-wordgame_1.1.9.bb b/packages/opie-wordgame/opie-wordgame_1.1.9.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/opie-wordgame/opie-wordgame_1.1.9.bb
diff --git a/packages/opie-write/opie-write_1.1.9.bb b/packages/opie-write/opie-write_1.1.9.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/opie-write/opie-write_1.1.9.bb
diff --git a/packages/opie-zkbapplet/opie-zkbapplet_1.1.9.bb b/packages/opie-zkbapplet/opie-zkbapplet_1.1.9.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/opie-zkbapplet/opie-zkbapplet_1.1.9.bb
diff --git a/packages/opie-zlines/opie-zlines_1.1.9.bb b/packages/opie-zlines/opie-zlines_1.1.9.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/opie-zlines/opie-zlines_1.1.9.bb
diff --git a/packages/opie-zsafe/opie-zsafe_1.1.8.bb b/packages/opie-zsafe/opie-zsafe_1.1.8.bb
deleted file mode 100644
index b0cc2438f1..0000000000
--- a/packages/opie-zsafe/opie-zsafe_1.1.8.bb
+++ /dev/null
@@ -1,26 +0,0 @@
-DESCRIPTION = "Password manager program for Opie."
-SECTION = "opie/applications"
-PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
-LICENSE = "GPL"
-
-APPNAME = "zsafe"
-
-
-TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
-SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/zsafe \
-           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
-           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
-
-S = "${WORKDIR}/${APPNAME}"
-
-inherit opie
-
-QMAKE_PROFILES = "zsafe.pro"
-
-# FILES bin/zsafe apps/Applications/zsafe.desktop pics/zsafe/zsafe.png
-do_install() {
-        install -d ${D}${palmtopdir}/pics/${APPNAME}/
-        install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
-}
-
diff --git a/packages/opie-zsafe/opie-zsafe_1.1.9.bb b/packages/opie-zsafe/opie-zsafe_1.1.9.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/opie-zsafe/opie-zsafe_1.1.9.bb
diff --git a/packages/opie-zsame/opie-zsame_1.1.9.bb b/packages/opie-zsame/opie-zsame_1.1.9.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/opie-zsame/opie-zsame_1.1.9.bb