merge of '3b04f9d33d900f95c8814c78ad7693a4bd404ded'

     and 'f6a57e1a7e63e62b04f74e02986c4cc6c30ece2a'

104 files changed, 459 insertions, 138 deletions

diff --git a/classes/opie.bbclass b/classes/opie.bbclass
index c11cf0b4de..6324dbf522 100644
--- a/classes/opie.bbclass
+++ b/classes/opie.bbclass
@@ -21,7 +21,8 @@ DEPENDS_prepend = "${@["libopie2 ", ""][(bb.data.getVar('PN', d, 1) == 'libopie2
 
 # to be consistent, put all targets into workdir
 # NOTE: leave one space at the end, other files are expecting that
-EXTRA_QMAKEVARS_POST += "DESTDIR=${S} "
+EXTRA_QMAKEVARS_POST += " DESTDIR=${S} "
+EXTRA_QMAKEVARS_POST += " DEFINES+=OPIE_BINDIR='\"${bindir}\"' DEFINES+=OPIE_LIBDIR='\"${libdir}/opie/lib\"' DEFINES+=OPIE_QTDIR='\"${libdir}/opie\"' "
 
 # Opie standard TAG value
 TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
diff --git a/conf/machine/fsg3be.conf b/conf/machine/fsg3be.conf
new file mode 100644
index 0000000000..a909a0f43c
--- /dev/null
+++ b/conf/machine/fsg3be.conf
@@ -0,0 +1,23 @@
+#@TYPE: Machine
+#@NAME: Freecom FSG-3 (big-endian)
+#@DESCRIPTION: Machine configuration for an FSG3 in big-endian mode
+
+TARGET_ARCH = "armeb"
+
+PACKAGE_EXTRA_ARCHS = "armv4b armv4tb armv5eb armv5teb ixp4xxbe"
+
+MACHINE_ARCH = "ixp4xxbe"
+
+OVERRIDES = "local:${MACHINE}:ixp4xxbe:ixp4xx:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}"
+
+# Match the vendor's latest kernel
+PREFERRED_PROVIDER_virtual/kernel ?= "fsg3-kernel"
+PREFERRED_VERSION_fsg3-kernel = "2.6.18"
+KERNEL_CCSUFFIX = "-3.4.4+csl-arm-2005q3"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-3.4.4+csl-arm-2005q3 = "gcc-cross-kernel-3.4.4"
+PREFERRED_VERSION_virtual/${TARGET_PREFIX}gcc-3.4.4+csl-arm-2005q3 = "csl-arm-2005q3"
+
+require conf/machine/include/ixp4xx.conf
+
+# No room for jffs2 - the rootfs needs to be installed directly to disk
+IMAGE_FSTYPES = "tar.gz"
diff --git a/packages/arm-kernel-shim/arm-kernel-shim_1.5.bb b/packages/arm-kernel-shim/arm-kernel-shim_1.5.bb
index 9e2b6fd912..fee3691c3c 100644
--- a/packages/arm-kernel-shim/arm-kernel-shim_1.5.bb
+++ b/packages/arm-kernel-shim/arm-kernel-shim_1.5.bb
@@ -5,7 +5,7 @@ HOMEPAGE = "http://wiki.buici.com/twiki/bin/view/Main/ApexBootloader"
 LICENSE = "GPL"
 PR = "r2"
 
-COMPATIBLE_MACHINE = "(ixp4xx|nslu2)"
+COMPATIBLE_MACHINE = "(ixp4xx|nslu2|fsg3)"
 
 SRC_URI = "ftp://ftp.buici.com/pub/arm/arm-kernel-shim/arm-kernel-shim-${PV}.tar.gz \
 	   file://config-nslu2.h \
diff --git a/packages/db/db3_3.2.9.bb b/packages/db/db3_3.2.9.bb
index 335d83c173..a130d89bd5 100644
--- a/packages/db/db3_3.2.9.bb
+++ b/packages/db/db3_3.2.9.bb
@@ -11,7 +11,7 @@ CONFLICTS = "db"
 # a build to select the desired one.
 PROVIDES += "${VIRTUAL_NAME}"
 
-SRC_URI = "ftp://sleepycat1.inetu.net/releases/db-${PV}.tar.gz \
+SRC_URI = "http://download-west.oracle.com/berkeley-db/db-${PV}.tar.gz \
 	   file://autofoo.patch;patch=1"
 S = "${WORKDIR}/db-${PV}/dist"
 B = "${WORKDIR}/db-${PV}/build_unix"
diff --git a/packages/gcc/gcc-cross-kernel-3.4.4_csl-arm-2005q3.bb b/packages/gcc/gcc-cross-kernel-3.4.4_csl-arm-2005q3.bb
new file mode 100644
index 0000000000..4b7e7b715c
--- /dev/null
+++ b/packages/gcc/gcc-cross-kernel-3.4.4_csl-arm-2005q3.bb
@@ -0,0 +1,25 @@
+# This kernel compiler is required by the Freecom FSG-3 machine
+# Please talk to Rod Whitby before considering removing this file.
+
+DEFAULT_PREFERENCE = "-1"
+
+SECTION = "devel"
+# cut-down gcc for kernel builds
+# only installs ${TARGET_PREFIX}gcc-${PV}, not ${TARGET_PREFIX}gcc.
+
+require gcc-cross-initial_${PV}.bb
+
+PROVIDES = "virtual/${TARGET_PREFIX}gcc-${PV}"
+
+SRC_URI += "file://gcc-3.4.4-makefile-fix.patch;patch=1"
+
+do_install () {
+	:
+}
+
+do_stage () {
+	cd gcc
+	oe_runmake install-common install-headers install-libgcc
+	install -m 0755 xgcc ${CROSS_DIR}/bin/${TARGET_PREFIX}gcc-${PV}
+}
+
diff --git a/packages/glibc/files/etc/ld.so.conf b/packages/glibc/files/etc/ld.so.conf
index fb1aab516d..dfa65edb85 100644
--- a/packages/glibc/files/etc/ld.so.conf
+++ b/packages/glibc/files/etc/ld.so.conf
@@ -1,3 +1,2 @@
 /usr/local/lib
-/opt/QtPalmtop/lib
 /usr/X11R6/lib
diff --git a/packages/glibc/glibc-2.2.5/etc/ld.so.conf b/packages/glibc/glibc-2.2.5/etc/ld.so.conf
index 3f9b41aabb..46e06d3f0a 100644
--- a/packages/glibc/glibc-2.2.5/etc/ld.so.conf
+++ b/packages/glibc/glibc-2.2.5/etc/ld.so.conf
@@ -1,3 +1,2 @@
 /usr/local/lib
-/opt/QtPalmtop/lib
 
diff --git a/packages/glibc/glibc-2.3.2/etc/ld.so.conf b/packages/glibc/glibc-2.3.2/etc/ld.so.conf
index 3f9b41aabb..46e06d3f0a 100644
--- a/packages/glibc/glibc-2.3.2/etc/ld.so.conf
+++ b/packages/glibc/glibc-2.3.2/etc/ld.so.conf
@@ -1,3 +1,2 @@
 /usr/local/lib
-/opt/QtPalmtop/lib
 
diff --git a/packages/glibc/glibc-2.4/etc/ld.so.conf b/packages/glibc/glibc-2.4/etc/ld.so.conf
index 3f9b41aabb..46e06d3f0a 100644
--- a/packages/glibc/glibc-2.4/etc/ld.so.conf
+++ b/packages/glibc/glibc-2.4/etc/ld.so.conf
@@ -1,3 +1,2 @@
 /usr/local/lib
-/opt/QtPalmtop/lib
 
diff --git a/packages/glibc/glibc-cvs/etc/ld.so.conf b/packages/glibc/glibc-cvs/etc/ld.so.conf
index 3f9b41aabb..46e06d3f0a 100644
--- a/packages/glibc/glibc-cvs/etc/ld.so.conf
+++ b/packages/glibc/glibc-cvs/etc/ld.so.conf
@@ -1,3 +1,2 @@
 /usr/local/lib
-/opt/QtPalmtop/lib
 
diff --git a/packages/ixp4xx/ixp4xx-npe-native-2.3.2/IxNpeMicrocode.h b/packages/ixp4xx/ixp4xx-npe-native-2.3.2/IxNpeMicrocode.h
index 1c3d1ff473..2229619a27 100644
--- a/packages/ixp4xx/ixp4xx-npe-native-2.3.2/IxNpeMicrocode.h
+++ b/packages/ixp4xx/ixp4xx-npe-native-2.3.2/IxNpeMicrocode.h
@@ -51,11 +51,11 @@
 // #define IX_NPEDL_NPEIMAGE_NPEC_DMA
 // #define IX_NPEDL_NPEIMAGE_NPEC_CRYPTO_AES_ETH_LEARN_FILTER_SPAN
 // #define IX_NPEDL_NPEIMAGE_NPEC_CRYPTO_AES_ETH_LEARN_FILTER_FIREWALL
-#define IX_NPEDL_NPEIMAGE_NPEC_CRYPTO_AES_CCM_ETH
+// #define IX_NPEDL_NPEIMAGE_NPEC_CRYPTO_AES_CCM_ETH
 // #define IX_NPEDL_NPEIMAGE_NPEC_CRYPTO_ETH_LEARN_FILTER_SPAN_FIREWALL
 // #define IX_NPEDL_NPEIMAGE_NPEC_ETH_SPAN_FIREWALL_VLAN_QOS_HDR_CONV
 // #define IX_NPEDL_NPEIMAGE_NPEC_ETH_LEARN_FILTER_SPAN_FIREWALL_VLAN_QOS
-// #define IX_NPEDL_NPEIMAGE_NPEC_ETH_LEARN_FILTER_SPAN_FIREWALL
+#define IX_NPEDL_NPEIMAGE_NPEC_ETH_LEARN_FILTER_SPAN_FIREWALL
 
 
 #include <stdio.h>
diff --git a/packages/ixp4xx/ixp4xx-npe-native_2.3.2.bb b/packages/ixp4xx/ixp4xx-npe-native_2.3.2.bb
index 5b8af8f254..9db83352c4 100644
--- a/packages/ixp4xx/ixp4xx-npe-native_2.3.2.bb
+++ b/packages/ixp4xx/ixp4xx-npe-native_2.3.2.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Firmware converter for the IXP4xx line of devices"
 LICENSE = "Intel Public Licence"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "http://You-Have-To-Download-The-Microcode-Manually-So-Please-Read-ixp4xx-npe_2.3.2.bb-For-Instructions/IPL_ixp400NpeLibrary-2_3_2.zip"
 SRC_URI += "file://IxNpeMicrocode.h"
diff --git a/packages/ixp4xx/ixp4xx-npe_2.3.2.bb b/packages/ixp4xx/ixp4xx-npe_2.3.2.bb
index 3a13074240..b5b1665735 100644
--- a/packages/ixp4xx/ixp4xx-npe_2.3.2.bb
+++ b/packages/ixp4xx/ixp4xx-npe_2.3.2.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "NPE firmware for the IXP4xx line of devices"
 LICENSE = "Intel Public Licence"
-PR = "r0"
+PR = "r1"
 DEPENDS = "ixp4xx-npe-native"
 
 # You need to download the IPL_ixp400NpeLibrary-2_3_2.zip file (without crypto) from:
@@ -13,7 +13,7 @@ S = "${WORKDIR}/ixp400_xscale_sw/src/npeDl"
 
 COMPATIBLE_MACHINE = "(nslu2|ixp4xx)"
 
-FILES_${PN} = "${base_libdir}/firmware/NPE-B"
+FILES_${PN} = "${base_libdir}/firmware/NPE-B ${base_libdir}/firmware/NPE-C"
 
 do_compile() {
 	${STAGING_BINDIR_NATIVE}/IxNpeMicrocode-${PV} -be
@@ -24,10 +24,14 @@ do_install() {
 	rm ${S}/NPE-B
 	mv ${S}/NPE-B.* ${S}/NPE-B
 	install ${S}/NPE-B ${D}/${base_libdir}/firmware/
+	rm ${S}/NPE-C
+	mv ${S}/NPE-C.* ${S}/NPE-C
+	install ${S}/NPE-C ${D}/${base_libdir}/firmware/
 }
 
 do_populate_staging() {
 	install -d ${STAGING_FIRMWARE_DIR}
 	install ${S}/NPE-B ${STAGING_FIRMWARE_DIR}/
+	install ${S}/NPE-C ${STAGING_FIRMWARE_DIR}/
 }
 
diff --git a/packages/kdepimpi/kdepimpi-base.inc b/packages/kdepimpi/kdepimpi-base.inc
index cb845397bd..5a50be3de7 100644
--- a/packages/kdepimpi/kdepimpi-base.inc
+++ b/packages/kdepimpi/kdepimpi-base.inc
@@ -110,7 +110,7 @@ do_stage() {
 }
 
 do_install() {
-    install -d ${D}${palmtopdir}/bin \
+    install -d ${D}${bindir} \
                ${D}${palmtopdir}/lib \
                ${D}${palmtopdir}/apps/1Pim \
                ${D}${palmtopdir}/pics/kdepim/korganizer/icons16 \
@@ -136,10 +136,10 @@ do_install() {
         oe_libinstall -so -C ${S}/dest/ $f ${D}${palmtopdir}/lib
     done
 
-    install -m 0755 ${S}/dest/kopi ${D}${palmtopdir}/bin/kopi
-    install -m 0755 ${S}/dest/kapi ${D}${palmtopdir}/bin/kapi
+    install -m 0755 ${S}/dest/kopi ${D}${bindir}/kopi
+    install -m 0755 ${S}/dest/kapi ${D}${bindir}/kapi
     
-    install -d ${D}${bindir} ${D}${libdir}
+    install -d ${D}${libdir}
     install -m 0755 ${S}/dest/kammu ${D}${bindir}/kammu
     oe_libinstall -so -C ${S}/dest/ libmicrokammu ${D}${libdir}
 
@@ -152,11 +152,11 @@ do_install() {
 
 PACKAGES = "libmicrokcal libmicrokabc kopi-applet kopi kapi libmicrokdelibs kammu libmicrokammu"
 
-FILES_kopi = "${palmtopdir}/bin/kopi ${palmtopdir}/apps/1Pim/korganizer.desktop ${palmtopdir}/pics/kdepim/korganizer/* "
-FILES_kapi = "${palmtopdir}/bin/kapi ${palmtopdir}/apps/1Pim/kaddressbook.desktop ${palmtopdir}/pics/kdepim/kaddressbook/* ${palmtopdir}/lib/libmicrokabc_* ${palmtopdir}/lib/libmicrokabcformat_binary*"
+FILES_kopi = "${bindir}/kopi ${palmtopdir}/apps/1Pim/korganizer.desktop ${palmtopdir}/pics/kdepim/korganizer/* "
+FILES_kapi = "${bindir}/kapi ${palmtopdir}/apps/1Pim/kaddressbook.desktop ${palmtopdir}/pics/kdepim/kaddressbook/* ${palmtopdir}/lib/libmicrokabc_* ${palmtopdir}/lib/libmicrokabcformat_binary*"
 FILES_kopi-applet = "${palmtopdir}/plugins/applets/* ${palmtopdir}/pics/ko16.png ${palmtopdir}/pics/ko24.png"
-FILES_libmicrokabc = "${palmtopdir}/lib/libmicrokabc*"
-FILES_libmicrokcal = "${palmtopdir}/lib/libmicrokcal*"
-FILES_libmicrokdelibs = "${palmtopdir}/lib/*"
+FILES_libmicrokabc = "${palmtopdir}/lib/libmicrokabc.so.*"
+FILES_libmicrokcal = "${palmtopdir}/lib/libmicrokcal.so.*"
+FILES_libmicrokdelibs = "${palmtopdir}/lib/*.so.*"
 FILES_kammu = "${bindir}/kammu"
 FILES_libmicrokammu = "${libdir}/libmicrokammu*"
diff --git a/packages/kdepimpi/kdepimpi_2.2.7.bb b/packages/kdepimpi/kdepimpi_2.2.7.bb
index ca4d5c0786..7252d0a6f1 100644
--- a/packages/kdepimpi/kdepimpi_2.2.7.bb
+++ b/packages/kdepimpi/kdepimpi_2.2.7.bb
@@ -4,4 +4,4 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/kdepimpi/kdepimpi-${PV}.tar.gz \
 
 require kdepimpi-base.inc
 
-PR = "r1"
+PR = "r2"
diff --git a/packages/kdepimpi/pwmpi.inc b/packages/kdepimpi/pwmpi.inc
index c737d40e83..3866b70977 100644
--- a/packages/kdepimpi/pwmpi.inc
+++ b/packages/kdepimpi/pwmpi.inc
@@ -23,7 +23,7 @@ do_unstage() {
 }
 
 do_install() {
-    install -d ${D}${palmtopdir}/bin \
+    install -d ${D}${bindir} \
                ${D}${palmtopdir}/apps/Applications \
                ${D}${palmtopdir}/pics/kdepim/pwmanager/icons16 \
                ${D}${palmtopdir}/pics/kdepim/pwmanager/icons22
@@ -33,8 +33,8 @@ do_install() {
     install -m 0644 ${S}/bin/kdepim/pwmanager/icons22/*.png ${D}${palmtopdir}/pics/kdepim/pwmanager/icons22
     install -m 0644 pwmanager/pwmanager/pwmanager.desktop ${D}${palmtopdir}/apps/Applications/pwmanager.desktop
 
-    install -m 0755 ${S}/dest/pwmpi ${D}${palmtopdir}/bin/
+    install -m 0755 ${S}/dest/pwmpi ${D}${bindir}
 }
 
 PACKAGES = "${PN}"
-FILES_${PN} = "${palmtopdir}"
+FILES_${PN} = "${palmtopdir} ${bindir}"
diff --git a/packages/konqueror/konqueror-embedded_20070212.bb b/packages/konqueror/konqueror-embedded_20070212.bb
index 912597c223..02e411e9f7 100644
--- a/packages/konqueror/konqueror-embedded_20070212.bb
+++ b/packages/konqueror/konqueror-embedded_20070212.bb
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 HOMEPAGE = "http://www.konqueror.org/"
 DEPENDS = "openssl libpcre virtual/libqte2 dcopidl-native dcopidl2cpp-native"
 LICENSE = "LGPL GPL"
-PR = "r4"
+PR = "r5"
 
 # this Konqueror needs the KDEDIR set and the font helvetica installed on the target
 
@@ -19,7 +19,7 @@ S = "${WORKDIR}/kdenox"
 export QMAKE = "${STAGING_BINDIR_NATIVE}/qmake"
 export MOC = "${STAGING_BINDIR_NATIVE}/moc"
 export UIC = "${STAGING_BINDIR_NATIVE}/uic"
-export exec_prefix = "${palmtopdir}"
+#export exec_prefix = "${palmtopdir}"
 #export CXXFLAGS = "-fexceptions -frtti -DKJS_VERBOSE=1 -DQT_THREAD_SUPPORT -DQ_OS_UNIX -DQT_NO_DOM -DENABLE_BOOKMARKS"
 export CXXFLAGS = "-fexceptions -fno-rtti -DKJS_VERBOSE=1 -DQT_THREAD_SUPPORT -DQ_OS_UNIX -DENABLE_BOOKMARKS"
 export PCRE_CONFIG = "invalid"
@@ -86,10 +86,10 @@ do_install_append() {
 	install -m 0644 ${FILESDIR}/konqueror.desktop ${D}${palmtopdir}/apps/Applications/
 	install -d ${D}${palmtopdir}/pics/konqueror
 	install -m 0644 ${FILESDIR}/konqueror.png ${D}${palmtopdir}/pics/konqueror/
-	mv ${D}${palmtopdir}/bin/konqueror ${D}${palmtopdir}/bin/konqueror.bin
-	{ echo '#!/bin/sh' ; echo "KDEDIR=/usr exec ${palmtopdir}/bin/konqueror.bin" ; } > ${D}${palmtopdir}/bin/konqueror
-	chmod 0755 ${D}${palmtopdir}/bin/konqueror
+	mv ${D}${palmtopdir}/bin ${D}${bindir}
+	mv ${D}${bindir}/konqueror ${D}${bindir}/konqueror.bin
+	{ echo '#!/bin/sh' ; echo "KDEDIR=/usr exec ${bindir}/konqueror.bin" ; } > ${D}${bindir}/konqueror
+	chmod 0755 ${D}${bindir}/konqueror
 }
 
-FILES_${PN} = "${palmtopdir} ${datadir}"
-
+FILES_${PN} = "${palmtopdir} ${datadir} ${bindir}/konqueror* ${libdir}/libkonq*"
diff --git a/packages/linux/fsg3-kernel_2.6.18.bb b/packages/linux/fsg3-kernel_2.6.18.bb
new file mode 100644
index 0000000000..2e9991f548
--- /dev/null
+++ b/packages/linux/fsg3-kernel_2.6.18.bb
@@ -0,0 +1,22 @@
+# Kernel for Freecom FSG-3
+#
+# This bitbake file pulls patches and the defconfig straight
+# from the NSLU2-Linux SVN repository. Information about this
+# repository can be found at:
+# http://trac.nslu2-linux.org/kernel/
+#
+# The revision that is pulled from SVN is specified below
+IXP4XX_KERNEL_SVN_REV = "898"
+#
+# The directory containing the patches to be applied is
+# specified below
+IXP4XX_KERNEL_PATCH_DIR = "2.6.18-fsg3"
+#
+# Increment the number below (i.e. the digits after PR) when
+# the changes in SVN between revisions include changes in the
+# patches applied to the kernel, rather than simply defconfig
+# changes
+PR = "r1.${IXP4XX_KERNEL_SVN_REV}"
+
+require ixp4xx-kernel.inc
+require ixp4xx-kernel-svnpatch.inc
diff --git a/packages/linux/ixp4xx-kernel.inc b/packages/linux/ixp4xx-kernel.inc
index 1c9d004d0f..367685f112 100644
--- a/packages/linux/ixp4xx-kernel.inc
+++ b/packages/linux/ixp4xx-kernel.inc
@@ -151,7 +151,7 @@ SRC_URI  = "${IXP4XX_SRCURI}"
 SRC_URI += "${IXP4XX_PATCHES}"
 
 COMPATIBLE_HOST = 'arm.*-linux.*'
-COMPATIBLE_MACHINE = '(ixp4xx|nslu2)'
+COMPATIBLE_MACHINE = '(ixp4xx|nslu2|fsg3)'
 
 inherit kernel
 
diff --git a/packages/linux/linux-rp-2.6.21/connectplus-prevent-oops-HACK.patch b/packages/linux/linux-rp-2.6.21/connectplus-prevent-oops-HACK.patch
new file mode 100644
index 0000000000..b5439c62e7
--- /dev/null
+++ b/packages/linux/linux-rp-2.6.21/connectplus-prevent-oops-HACK.patch
@@ -0,0 +1,17 @@
+Index: linux-2.6.21/drivers/net/wireless/hostap/hostap_hw.c
+===================================================================
+--- linux-2.6.21.orig/drivers/net/wireless/hostap/hostap_hw.c	2007-07-07 12:45:39.000000000 +0100
++++ linux-2.6.21/drivers/net/wireless/hostap/hostap_hw.c	2007-07-07 12:47:30.000000000 +0100
+@@ -2666,6 +2666,12 @@
+ 	iface = netdev_priv(dev);
+ 	local = iface->local;
+ 
++	if(dev->base_addr == 0)
++	{
++		printk(KERN_DEBUG "%s: IRQ before base_addr set\n", dev->name);
++		return IRQ_HANDLED;
++	}
++
+ 	prism2_io_debug_add(dev, PRISM2_IO_DEBUG_CMD_INTERRUPT, 0, 0);
+ 
+ 	if (local->func->card_present && !local->func->card_present(local)) {
diff --git a/packages/linux/linux-rp_2.6.21.bb b/packages/linux/linux-rp_2.6.21.bb
index 5c3b5e3a28..980732d409 100644
--- a/packages/linux/linux-rp_2.6.21.bb
+++ b/packages/linux/linux-rp_2.6.21.bb
@@ -1,6 +1,6 @@
 require linux-rp.inc
 
-PR = "r8"
+PR = "r9"
 
 # Handy URLs
 # git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ef7d1b244fa6c94fb76d5f787b8629df64ea4046
@@ -49,6 +49,7 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.21.tar.bz2 \
            ${RPSRC}/pxa_cf_initorder_hack-r1.patch;patch=1;status=hack \
            file://pxa-serial-hack.patch;patch=1;status=hack \
            file://connectplus-remove-ide-HACK.patch;patch=1;status=hack \
+	   file://connectplus-prevent-oops-HACK.patch;patch=1;status=hack \
            file://squashfs3.0-2.6.15.patch;patch=1;status=external \
            file://vesafb-tng-1.0-rc2-2.6.20-rc2.patch;patch=1;status=external \
            file://sharpsl-rc-r1.patch;patch=1 \
diff --git a/packages/linux/linux/simpad/defconfig b/packages/linux/linux/simpad/defconfig
index 279847c763..33f08a0593 100644
--- a/packages/linux/linux/simpad/defconfig
+++ b/packages/linux/linux/simpad/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.21
-# Tue Jul  3 21:29:59 2007
+# Sat Jul  7 00:02:55 2007
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -553,7 +553,30 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 #
 # ATA/ATAPI/MFM/RLL support
 #
-# CONFIG_IDE is not set
+CONFIG_IDE=m
+CONFIG_IDE_MAX_HWIFS=4
+CONFIG_BLK_DEV_IDE=m
+
+#
+# Please see Documentation/ide.txt for help/info on IDE drives
+#
+# CONFIG_BLK_DEV_IDE_SATA is not set
+CONFIG_BLK_DEV_IDEDISK=m
+CONFIG_IDEDISK_MULTI_MODE=y
+CONFIG_BLK_DEV_IDECS=m
+CONFIG_BLK_DEV_IDECD=m
+# CONFIG_BLK_DEV_IDETAPE is not set
+# CONFIG_BLK_DEV_IDEFLOPPY is not set
+# CONFIG_IDE_TASK_IOCTL is not set
+
+#
+# IDE chipset support/bugfixes
+#
+# CONFIG_IDE_GENERIC is not set
+# CONFIG_IDE_ARM is not set
+# CONFIG_IDE_CHIPSETS is not set
+# CONFIG_BLK_DEV_IDEDMA is not set
+# CONFIG_BLK_DEV_HD is not set
 
 #
 # SCSI device support
@@ -940,7 +963,7 @@ CONFIG_SOUND=y
 #
 # HID Devices
 #
-CONFIG_HID=y
+CONFIG_HID=m
 # CONFIG_HID_DEBUG is not set
 
 #
@@ -996,20 +1019,22 @@ CONFIG_FS_POSIX_ACL=y
 # CONFIG_GFS2_FS is not set
 # CONFIG_OCFS2_FS is not set
 # CONFIG_MINIX_FS is not set
-# CONFIG_ROMFS_FS is not set
+CONFIG_ROMFS_FS=m
 CONFIG_INOTIFY=y
 CONFIG_INOTIFY_USER=y
 # CONFIG_QUOTA is not set
 CONFIG_DNOTIFY=y
 # CONFIG_AUTOFS_FS is not set
-# CONFIG_AUTOFS4_FS is not set
+CONFIG_AUTOFS4_FS=m
 # CONFIG_FUSE_FS is not set
 CONFIG_GENERIC_ACL=y
 
 #
 # CD-ROM/DVD Filesystems
 #
-# CONFIG_ISO9660_FS is not set
+CONFIG_ISO9660_FS=m
+CONFIG_JOLIET=y
+CONFIG_ZISOFS=y
 # CONFIG_UDF_FS is not set
 
 #
@@ -1065,23 +1090,26 @@ CONFIG_CRAMFS=m
 #
 CONFIG_NFS_FS=y
 CONFIG_NFS_V3=y
-# CONFIG_NFS_V3_ACL is not set
-# CONFIG_NFS_V4 is not set
+CONFIG_NFS_V3_ACL=y
+CONFIG_NFS_V4=y
 # CONFIG_NFS_DIRECTIO is not set
 # CONFIG_NFSD is not set
-# CONFIG_ROOT_NFS is not set
+CONFIG_ROOT_NFS=y
 CONFIG_LOCKD=y
 CONFIG_LOCKD_V4=y
+CONFIG_NFS_ACL_SUPPORT=y
 CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=y
-# CONFIG_RPCSEC_GSS_KRB5 is not set
+CONFIG_SUNRPC_GSS=y
+CONFIG_RPCSEC_GSS_KRB5=y
 # CONFIG_RPCSEC_GSS_SPKM3 is not set
 CONFIG_SMB_FS=m
 # CONFIG_SMB_NLS_DEFAULT is not set
 CONFIG_CIFS=m
 # CONFIG_CIFS_STATS is not set
 # CONFIG_CIFS_WEAK_PW_HASH is not set
-# CONFIG_CIFS_XATTR is not set
+CONFIG_CIFS_XATTR=y
+CONFIG_CIFS_POSIX=y
 # CONFIG_CIFS_DEBUG2 is not set
 # CONFIG_CIFS_EXPERIMENTAL is not set
 # CONFIG_NCP_FS is not set
@@ -1196,14 +1224,14 @@ CONFIG_DEBUG_LL=y
 # Cryptographic options
 #
 CONFIG_CRYPTO=y
-CONFIG_CRYPTO_ALGAPI=m
-CONFIG_CRYPTO_BLKCIPHER=m
-CONFIG_CRYPTO_MANAGER=m
+CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_BLKCIPHER=y
+CONFIG_CRYPTO_MANAGER=y
 # CONFIG_CRYPTO_HMAC is not set
 # CONFIG_CRYPTO_XCBC is not set
 # CONFIG_CRYPTO_NULL is not set
 # CONFIG_CRYPTO_MD4 is not set
-# CONFIG_CRYPTO_MD5 is not set
+CONFIG_CRYPTO_MD5=y
 CONFIG_CRYPTO_SHA1=m
 # CONFIG_CRYPTO_SHA256 is not set
 # CONFIG_CRYPTO_SHA512 is not set
@@ -1211,10 +1239,10 @@ CONFIG_CRYPTO_SHA1=m
 # CONFIG_CRYPTO_TGR192 is not set
 # CONFIG_CRYPTO_GF128MUL is not set
 CONFIG_CRYPTO_ECB=m
-CONFIG_CRYPTO_CBC=m
+CONFIG_CRYPTO_CBC=y
 CONFIG_CRYPTO_PCBC=m
 # CONFIG_CRYPTO_LRW is not set
-# CONFIG_CRYPTO_DES is not set
+CONFIG_CRYPTO_DES=y
 # CONFIG_CRYPTO_FCRYPT is not set
 # CONFIG_CRYPTO_BLOWFISH is not set
 # CONFIG_CRYPTO_TWOFISH is not set
diff --git a/packages/ntp/ntp-4.2.2p3/tickadj.c.patch b/packages/ntp/ntp-4.2.2p3/tickadj.c.patch
new file mode 100644
index 0000000000..9ef9de9e1f
--- /dev/null
+++ b/packages/ntp/ntp-4.2.2p3/tickadj.c.patch
@@ -0,0 +1,32 @@
+Index: ntp-4.2.2p3-r0/ntp-4.2.2p3/util/tickadj.c
+===================================================================
+--- ntp-4.2.2p3/util/tickadj.c	2004-02-25 06:58:33.000000000 +0100
++++ ntp-4.2.2p3/util/tickadj.c	2007-07-07 01:00:54.000000000 +0200
+@@ -21,7 +21,8 @@
+ # include <unistd.h>
+ #endif /* HAVE_UNISTD_H */
+ 
+-#ifdef HAVE___ADJTIMEX		/* Linux */
++/* proper handling here has been moved to upstream ntp bugzilla */
++#ifdef linux
+ 
+ #include <sys/timex.h>
+ struct timex txc;
+@@ -91,7 +92,7 @@
+ 	}
+ 
+ 	if (!errflg) {
+-		if (__adjtimex(&txc) < 0)
++		if (adjtimex(&txc) < 0)
+ 			perror("adjtimex");
+ 		else if (!quiet)
+ 			printf("tick     = %ld\ntick_adj = %d\n",
+@@ -146,7 +147,7 @@
+ #endif
+ 	}
+     
+-	if (__adjtimex(&txc) < 0)
++	if (adjtimex(&txc) < 0)
+ 	{
+ 		perror("adjtimex");
+ 	}
diff --git a/packages/ntp/ntp_4.2.2p3.bb b/packages/ntp/ntp_4.2.2p3.bb
index 28853e4fc8..ad861cf8f5 100644
--- a/packages/ntp/ntp_4.2.2p3.bb
+++ b/packages/ntp/ntp_4.2.2p3.bb
@@ -2,6 +2,7 @@ require ntp.inc
 
 SRC_URI = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/${P}.tar.gz \
 	file://ipv6only-workaround.patch;patch=1 \
+	file://tickadj.c.patch;patch=1 \
 	file://ntpd \
 	file://ntp.conf \
 	file://ntpdate"
diff --git a/packages/obexftp/obexftp_0.20.bb b/packages/obexftp/obexftp_0.20.bb
index 4920ae9eff..386e83d6dc 100644
--- a/packages/obexftp/obexftp_0.20.bb
+++ b/packages/obexftp/obexftp_0.20.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "OBEX Ftp Client based on openobex."
 SECTION = "console/network"
 HOMEPAGE = "http://openobex.triq.net"
 LICENSE = "GPL"
-DEPENDS = "openobex libgsm libiconv"
+DEPENDS = "openobex libgsm virtual/libiconv"
 PR = "r3"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/openobex/obexftp-${PV}.tar.gz \
diff --git a/packages/openssl/openssl-0.9.7g/gnueabi-armeb.patch b/packages/openssl/openssl-0.9.7g/gnueabi-armeb.patch
new file mode 100644
index 0000000000..38f725b789
--- /dev/null
+++ b/packages/openssl/openssl-0.9.7g/gnueabi-armeb.patch
@@ -0,0 +1,10 @@
+--- openssl-0.9.7g/Configure~	2007-07-07 21:08:27.000000000 +0930
++++ openssl-0.9.7g/Configure	2007-07-07 21:13:41.000000000 +0930
+@@ -477,6 +477,7 @@
+ "linux-elf-arm","gcc:-DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "linux-elf-armeb","gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "linux-gnueabi-arm","gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"linux-gnueabi-armeb","gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ 
+ # SCO/Caldera targets.
+ #
diff --git a/packages/openssl/openssl_0.9.7g.bb b/packages/openssl/openssl_0.9.7g.bb
index cc9162c1cf..d61a3a8297 100644
--- a/packages/openssl/openssl_0.9.7g.bb
+++ b/packages/openssl/openssl_0.9.7g.bb
@@ -2,8 +2,9 @@ inherit pkgconfig
 
 require openssl.inc
 
-PR = "r3"
+PR = "r4"
 
 SRC_URI += "file://debian.patch;patch=1 \
             file://armeb.patch;patch=1;pnum=0 \
-            file://gnueabi-arm.patch;patch=1"
+            file://gnueabi-arm.patch;patch=1 \
+            file://gnueabi-armeb.patch;patch=1"
diff --git a/packages/opie-alarm/opie-alarm/dirdefines.patch b/packages/opie-alarm/opie-alarm/dirdefines.patch
new file mode 100644
index 0000000000..ea1e686dce
--- /dev/null
+++ b/packages/opie-alarm/opie-alarm/dirdefines.patch
@@ -0,0 +1,21 @@
+diff --git a/opiealarm.c b/opiealarm.c
+index 422865c..b948ef2 100644
+--- a/opiealarm.c
++++ b/opiealarm.c
+@@ -367,13 +367,13 @@ int resume ( int resuspend )
+ 				
+ 				setenv ( "LOGNAME", "root", 1 );
+ 				setenv ( "HOME", "/root", 1 );
+-				setenv ( "LD_LIBRARY_PATH", "/opt/QtPalmtop/lib", 1 );
+-				setenv ( "QTDIR", "/opt/QtPalmtop", 1 );
++				setenv ( "LD_LIBRARY_PATH", OPIE_LIBDIR, 1 );
++				setenv ( "QTDIR", OPIE_QTDIR, 1 );
+ 			
+ 				remove_pidfile ( );
+ 			
+ 				// no need for system() since this process is no longer useful anyway				
+-				execv ( "/opt/QtPalmtop/bin/qcop", argv );
++				execv ( OPIE_BINDIR "/qcop", argv );
+ 				
+ 				perror ( "exec for qcop failed" );
+ 				return 5;
diff --git a/packages/opie-alarm/opie-alarm_cvs.bb b/packages/opie-alarm/opie-alarm_cvs.bb
index b5927363d1..2cdb067668 100644
--- a/packages/opie-alarm/opie-alarm_cvs.bb
+++ b/packages/opie-alarm/opie-alarm_cvs.bb
@@ -1,7 +1,8 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
-PR = "r2"
+PR = "r2.1"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/opiealarm \
-           file://01opiealarm "
+           file://01opiealarm \
+	   file://dirdefines.patch;patch=1 "
diff --git a/packages/opie-autorotateapplet/opie-autorotateapplet.inc b/packages/opie-autorotateapplet/opie-autorotateapplet.inc
index 4d0f36f54d..7e7843666d 100644
--- a/packages/opie-autorotateapplet/opie-autorotateapplet.inc
+++ b/packages/opie-autorotateapplet/opie-autorotateapplet.inc
@@ -13,7 +13,7 @@ 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()"
+  ${bindir}/qcop QPE/TaskBar "reloadApplets()"
 else
   exit 0
 fi
@@ -22,7 +22,7 @@ fi
 pkg_postrm() {
 #!/bin/sh
 if [ -n "$D" ]; then exit 1; fi
-/opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
+${bindir}/qcop QPE/TaskBar "reloadApplets()"
 }
 
 # FILES plugins/applets/libautorotateapplet.so* pics/autorotate/*.png
diff --git a/packages/opie-autorotateapplet/opie-autorotateapplet_cvs.bb b/packages/opie-autorotateapplet/opie-autorotateapplet_cvs.bb
index 6c1e0a212f..97cc8f53ce 100644
--- a/packages/opie-autorotateapplet/opie-autorotateapplet_cvs.bb
+++ b/packages/opie-autorotateapplet/opie-autorotateapplet_cvs.bb
@@ -1,6 +1,7 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/applets/autorotateapplet \
 	   ${HANDHELDS_CVS};module=opie/pics"
diff --git a/packages/opie-batteryapplet/opie-batteryapplet.inc b/packages/opie-batteryapplet/opie-batteryapplet.inc
index b01e21b0f0..10b6e9096b 100644
--- a/packages/opie-batteryapplet/opie-batteryapplet.inc
+++ b/packages/opie-batteryapplet/opie-batteryapplet.inc
@@ -13,7 +13,7 @@ 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()"
+  ${bindir}/qcop QPE/TaskBar "reloadApplets()"
 else
   exit 0
 fi
@@ -21,7 +21,7 @@ fi
 
 pkg_postrm() {
 #!/bin/sh
-/opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
+${bindir}/qcop QPE/TaskBar "reloadApplets()"
  if [ -n "$D" ]; then false; fi
 }
 
diff --git a/packages/opie-batteryapplet/opie-batteryapplet_cvs.bb b/packages/opie-batteryapplet/opie-batteryapplet_cvs.bb
index 74041194c3..ed9b98120a 100644
--- a/packages/opie-batteryapplet/opie-batteryapplet_cvs.bb
+++ b/packages/opie-batteryapplet/opie-batteryapplet_cvs.bb
@@ -1,6 +1,7 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/batteryapplet \
            ${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-brightnessapplet/opie-brightnessapplet.inc b/packages/opie-brightnessapplet/opie-brightnessapplet.inc
index 0db87dbb98..bc638658bb 100644
--- a/packages/opie-brightnessapplet/opie-brightnessapplet.inc
+++ b/packages/opie-brightnessapplet/opie-brightnessapplet.inc
@@ -17,7 +17,7 @@ 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()"
+  ${bindir}/qcop QPE/TaskBar "reloadApplets()"
 else
   exit 0
 fi
@@ -26,6 +26,6 @@ fi
 pkg_postrm() {
 #!/bin/sh
 if [ -n "$D" ]; then exit 1; fi
-/opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
+${bindir}/qcop QPE/TaskBar "reloadApplets()"
 }
 
diff --git a/packages/opie-brightnessapplet/opie-brightnessapplet_cvs.bb b/packages/opie-brightnessapplet/opie-brightnessapplet_cvs.bb
index a364980c1a..7bdec3e27e 100644
--- a/packages/opie-brightnessapplet/opie-brightnessapplet_cvs.bb
+++ b/packages/opie-brightnessapplet/opie-brightnessapplet_cvs.bb
@@ -1,6 +1,7 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/applets/brightnessapplet \
            ${HANDHELDS_CVS};module=opie/pics"
diff --git a/packages/opie-clipboardapplet/opie-clipboardapplet.inc b/packages/opie-clipboardapplet/opie-clipboardapplet.inc
index 9384f7f2ab..5b2db9faea 100644
--- a/packages/opie-clipboardapplet/opie-clipboardapplet.inc
+++ b/packages/opie-clipboardapplet/opie-clipboardapplet.inc
@@ -13,13 +13,13 @@ 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()"
+  ${bindir}/qcop QPE/TaskBar "reloadApplets()"
 fi
 }
 
 pkg_postrm() {
 #!/bin/sh
-/opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
+${bindir}/qcop QPE/TaskBar "reloadApplets()"
  if [ -n "$D" ]; then false; fi
 }
 
diff --git a/packages/opie-clipboardapplet/opie-clipboardapplet_cvs.bb b/packages/opie-clipboardapplet/opie-clipboardapplet_cvs.bb
index 72ae6d2ea4..95b33b46a9 100644
--- a/packages/opie-clipboardapplet/opie-clipboardapplet_cvs.bb
+++ b/packages/opie-clipboardapplet/opie-clipboardapplet_cvs.bb
@@ -1,6 +1,7 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/clipboardapplet \
            ${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-clockapplet/opie-clockapplet.inc b/packages/opie-clockapplet/opie-clockapplet.inc
index 112c11180a..238819c071 100644
--- a/packages/opie-clockapplet/opie-clockapplet.inc
+++ b/packages/opie-clockapplet/opie-clockapplet.inc
@@ -13,13 +13,13 @@ 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()"
+  ${bindir}/qcop QPE/TaskBar "reloadApplets()"
 fi
 }
 
 pkg_postrm() {
 #!/bin/sh
-/opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
+${bindir}/qcop QPE/TaskBar "reloadApplets()"
  if [ -n "$D" ]; then false; fi
 }
 
diff --git a/packages/opie-clockapplet/opie-clockapplet_cvs.bb b/packages/opie-clockapplet/opie-clockapplet_cvs.bb
index 304b687109..46a6d8c7e7 100644
--- a/packages/opie-clockapplet/opie-clockapplet_cvs.bb
+++ b/packages/opie-clockapplet/opie-clockapplet_cvs.bb
@@ -1,6 +1,7 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/clockapplet \
            ${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/poboxserver/files/.mtn2git_empty b/packages/opie-dvorak/files/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/poboxserver/files/.mtn2git_empty
+++ b/packages/opie-dvorak/files/.mtn2git_empty
diff --git a/packages/opie-dvorak/files/fix-rpath.patch b/packages/opie-dvorak/files/fix-rpath.patch
new file mode 100644
index 0000000000..37e2e5a37d
--- /dev/null
+++ b/packages/opie-dvorak/files/fix-rpath.patch
@@ -0,0 +1,13 @@
+diff --git a/dvorak.pro b/dvorak.pro
+index b659ab5..c1cf861 100644
+--- a/dvorak.pro
++++ b/dvorak.pro
+@@ -9,7 +9,7 @@ DESTDIR		= ../../plugins/inputmethods
+ INCLUDEPATH += $(OPIEDIR)/include
+ DEPENDPATH      +=  ../../launcher
+ LIBS            += -lqpe -L$(OPIEDIR)/plugins/inputmethods -lqpickboard
+-QMAKE_LFLAGS	+= -Wl,-rpath,/opt/QtPalmtop/plugins/inputmethods
++QMAKE_LFLAGS	+= -Wl,-rpath,${palmtopdir}/plugins/inputmethods
+ VERSION		= 1.0.0
+ 
+ include( $(OPIEDIR)/include.pro )
diff --git a/packages/opie-dvorak/opie-dvorak.inc b/packages/opie-dvorak/opie-dvorak.inc
index 7e4445dd42..78ba4fc667 100644
--- a/packages/opie-dvorak/opie-dvorak.inc
+++ b/packages/opie-dvorak/opie-dvorak.inc
@@ -14,7 +14,7 @@ pkg_postinst() {
 #!/bin/sh
 if [ -n "$D" ]; then exit 1; fi
 if pidof -s qpe >/dev/null; then
-  /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadInputMethods()"
+  ${bindir}/qcop QPE/TaskBar "reloadInputMethods()"
 else
   exit 0
 fi
@@ -24,7 +24,7 @@ fi
 pkg_postrm() {
 #!/bin/sh
 if [ -n "$D" ]; then exit 1; fi
-/opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadInputMethods()"
+${bindir}/qcop QPE/TaskBar "reloadInputMethods()"
 }
 
 # FILES plugins/inputmethods/libqdvorak.so*
diff --git a/packages/opie-dvorak/opie-dvorak_cvs.bb b/packages/opie-dvorak/opie-dvorak_cvs.bb
index bf38334b0c..54234dda7a 100644
--- a/packages/opie-dvorak/opie-dvorak_cvs.bb
+++ b/packages/opie-dvorak/opie-dvorak_cvs.bb
@@ -1,6 +1,8 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/inputmethods/dvorak \
-           ${HANDHELDS_CVS};module=opie/inputmethods/pickboard"
+           ${HANDHELDS_CVS};module=opie/inputmethods/pickboard \
+	   file://fix-rpath.patch;patch=1 "
diff --git a/packages/opie-handwriting/opie-handwriting.inc b/packages/opie-handwriting/opie-handwriting.inc
index 86b9ab51c6..c4b79cb671 100644
--- a/packages/opie-handwriting/opie-handwriting.inc
+++ b/packages/opie-handwriting/opie-handwriting.inc
@@ -3,7 +3,6 @@ SECTION = "opie/inputmethods"
 PRIORITY = "optional"
 LICENSE = "GPL"
 APPNAME = "qhandwriting"
-PR = "r1"
 
 
 S = "${WORKDIR}/handwriting"
@@ -14,7 +13,7 @@ pkg_postinst() {
 #!/bin/sh
 if [ -n "$D" ]; then exit 1; fi
 if pidof -s qpe >/dev/null; then
-  /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadInputMethods()"
+  ${bindir}/qcop QPE/TaskBar "reloadInputMethods()"
 else
   exit 0
 fi
@@ -24,7 +23,7 @@ fi
 pkg_postrm() {
 #!/bin/sh
 if [ -n "$D" ]; then exit 1; fi
-/opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadInputMethods()"
+${bindir}/qcop QPE/TaskBar "reloadInputMethods()"
 }
 
 # FILES plugins/inputmethods/libqhandwriting.so*
diff --git a/packages/opie-handwriting/opie-handwriting_cvs.bb b/packages/opie-handwriting/opie-handwriting_cvs.bb
index a607b32c69..6f33501dc3 100644
--- a/packages/opie-handwriting/opie-handwriting_cvs.bb
+++ b/packages/opie-handwriting/opie-handwriting_cvs.bb
@@ -1,6 +1,7 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
+PR = "r2"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/inputmethods/handwriting \
 	${HANDHELDS_CVS};module=opie/etc/qimpen"
diff --git a/packages/opie-icon-reload/opie-icon-reload.inc b/packages/opie-icon-reload/opie-icon-reload.inc
index 131f2cc58b..a83aa34f96 100644
--- a/packages/opie-icon-reload/opie-icon-reload.inc
+++ b/packages/opie-icon-reload/opie-icon-reload.inc
@@ -13,11 +13,12 @@ FILES_${PN} += "${palmtopdir}"
 
 do_install() {		
 	install -d ${D}${palmtopdir}/apps/Settings
-	install -d ${D}${palmtopdir}/bin
+	install -d ${D}${bindir}
 	install -d ${D}${palmtopdir}/pics
 	
 	install -m 0644 ${WORKDIR}/icon-reload.desktop ${D}${palmtopdir}/apps/Settings
-	install -m 0755 ${WORKDIR}/icon-reload.sh ${D}${palmtopdir}/bin
+	install -m 0755 ${WORKDIR}/icon-reload.sh ${D}${bindir}
+	sed -i -e 's,@bindir@,${bindir},g' ${D}${bindir}/icon-reload.sh
 	install -m 0644 ${WORKDIR}/reload.png ${D}${palmtopdir}/pics	
 }
 
diff --git a/packages/opie-icon-reload/opie-icon-reload/icon-reload.sh b/packages/opie-icon-reload/opie-icon-reload/icon-reload.sh
index 3df151c207..adeba397ee 100755
--- a/packages/opie-icon-reload/opie-icon-reload/icon-reload.sh
+++ b/packages/opie-icon-reload/opie-icon-reload/icon-reload.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
 
-/opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadInputMethods()"                                            
-/opt/QtPalmtop/bin/qcop QPE/System "linkChanged(QString)" 
+@bindir@/qcop QPE/TaskBar "reloadInputMethods()"                                            
+@bindir@/qcop QPE/System "linkChanged(QString)" 
diff --git a/packages/opie-icon-reload/opie-icon-reload_1.2.2.bb b/packages/opie-icon-reload/opie-icon-reload_1.2.2.bb
index a4897d0190..13a5942517 100644
--- a/packages/opie-icon-reload/opie-icon-reload_1.2.2.bb
+++ b/packages/opie-icon-reload/opie-icon-reload_1.2.2.bb
@@ -1,3 +1,3 @@
 require ${PN}.inc
 
-PR = "r1"
+PR = "r2"
diff --git a/packages/opie-init/opie-init.inc b/packages/opie-init/opie-init.inc
index 138d07cb17..04a73cb4ea 100644
--- a/packages/opie-init/opie-init.inc
+++ b/packages/opie-init/opie-init.inc
@@ -41,5 +41,6 @@ do_install() {
 }
 
 #FILES_opie-init_append = " ${sysconfdir} ${palmtopdir}/bin"
+FILES_${PN} += "${palmtopdir}"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/packages/opie-init/opie-init/opie b/packages/opie-init/opie-init/opie
index 56c54e0a43..d7e06e5ce2 100755
--- a/packages/opie-init/opie-init/opie
+++ b/packages/opie-init/opie-init/opie
@@ -70,7 +70,7 @@ case $1 in
 	    echo "Starting qss" >>/var/log/opie-qss.log
 	    qss </dev/null >>/var/log/opie-qss.log 2>&1
 	    echo "qss exited, will try to restart" >>/var/log/opie-qss.log
-	done; rm /var/run/opie-qss-loop.pid; } &
+	done; rm /var/run/opie-qss-loop.pid; } </dev/null >/dev/null 2>&1 &
 	echo $! >/var/run/opie-qss-loop.pid
     fi
 
@@ -78,12 +78,12 @@ case $1 in
 
 'stop')
     echo "Stopping Opie..."
-    test -r /var/run/opie-qss-loop.pid && kill $(cat /var/run/opie-qss-loop.pid) 2>/dev/null ; rm /var/run/opie-qss-loop.pid
+    test -r /var/run/opie-qss-loop.pid && kill $(cat /var/run/opie-qss-loop.pid) 2>/dev/null ; rm -f /var/run/opie-qss-loop.pid
     killall qss 2>/dev/null
     killall qpe 2>/dev/null
     killall opie-login 2>/dev/null
     killall quicklauncher 2>/dev/null
-    test -r /var/run/opie-ssh-agent.pid && kill $(cat /var/run/opie-ssh-agent.pid) 2>/dev/null ; rm /var/run/opie-ssh-agent.pid
+    test -r /var/run/opie-ssh-agent.pid && kill $(cat /var/run/opie-ssh-agent.pid) 2>/dev/null ; rm -f /var/run/opie-ssh-agent.pid
     true
 
     ;;
diff --git a/packages/opie-init/opie-init_1.2.2.bb b/packages/opie-init/opie-init_1.2.2.bb
index 9d84d6188b..b52e162e50 100644
--- a/packages/opie-init/opie-init_1.2.2.bb
+++ b/packages/opie-init/opie-init_1.2.2.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-PR = "r7"
+PR = "r8"
 
 SRC_URI = "file://opie-reorgfiles \
            file://opie \
diff --git a/packages/qpobox/files/.mtn2git_empty b/packages/opie-irc/files/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/qpobox/files/.mtn2git_empty
+++ b/packages/opie-irc/files/.mtn2git_empty
diff --git a/packages/opie-irc/files/utf8.patch b/packages/opie-irc/files/utf8.patch
new file mode 100644
index 0000000000..cc562838a2
--- /dev/null
+++ b/packages/opie-irc/files/utf8.patch
@@ -0,0 +1,23 @@
+diff --git a/ircconnection.cpp b/ircconnection.cpp
+index 88e63f7..fb7e168 100644
+--- a/ircconnection.cpp
++++ b/ircconnection.cpp
+@@ -29,7 +29,8 @@ void IRCConnection::sendLine(QString line) {
+     while((line.right(1) == "\n") || (line.right(1) == "\r"))
+         line = line.left(line.length() - 1);
+     line.append("\r\n");
+-    m_socket->writeBlock(line, line.length());
++    QCString uline = line.utf8();
++    m_socket->writeBlock(uline, uline.length());
+ }
+ 
+ void IRCConnection::sendCTCPReply(const QString &nickname, const QString &type, const QString &args) {
+@@ -77,7 +78,7 @@ void IRCConnection::login() {
+ /* Called when data arrives on the socket */
+ void IRCConnection::dataReady() {
+     while(m_socket->canReadLine()) {
+-        IRCMessage message(m_socket->readLine());
++        IRCMessage message(QString::fromUtf8(m_socket->readLine()));
+         if (!m_loggedIn && message.isNumerical() && message.commandNumber() == 1) {
+             /* Now autojoin all channels specified inside the server profile */
+             QStringList channels = QStringList::split(QChar(','), m_server->channels());
diff --git a/packages/opie-irc/opie-irc_cvs.bb b/packages/opie-irc/opie-irc_cvs.bb
index f1ad3901c2..f7704f5493 100644
--- a/packages/opie-irc/opie-irc_cvs.bb
+++ b/packages/opie-irc/opie-irc_cvs.bb
@@ -1,8 +1,10 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/opieirc \
            ${HANDHELDS_CVS};module=opie/help \
            ${HANDHELDS_CVS};module=opie/apps \
-	   ${HANDHELDS_CVS};module=opie/pics"
+	   ${HANDHELDS_CVS};module=opie/pics \
+	   file://utf8.patch;patch=1 "
diff --git a/packages/opie-irdaapplet/opie-irdaapplet.inc b/packages/opie-irdaapplet/opie-irdaapplet.inc
index d9f15453a5..ed47c2ca60 100644
--- a/packages/opie-irdaapplet/opie-irdaapplet.inc
+++ b/packages/opie-irdaapplet/opie-irdaapplet.inc
@@ -13,13 +13,13 @@ 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()"
+  ${bindir}/qcop QPE/TaskBar "reloadApplets()"
 fi
 }
 
 pkg_postrm() {
 #!/bin/sh
-/opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
+${bindir}/qcop QPE/TaskBar "reloadApplets()"
  if [ -n "$D" ]; then false; fi
 }
 
diff --git a/packages/opie-irdaapplet/opie-irdaapplet_cvs.bb b/packages/opie-irdaapplet/opie-irdaapplet_cvs.bb
index 20c228419e..1fd3393fe1 100644
--- a/packages/opie-irdaapplet/opie-irdaapplet_cvs.bb
+++ b/packages/opie-irdaapplet/opie-irdaapplet_cvs.bb
@@ -1,7 +1,7 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
-PR = r2
+PR = r3
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/irdaapplet \
            ${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-keyboard/files/.mtn2git_empty b/packages/opie-keyboard/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/opie-keyboard/files/.mtn2git_empty
diff --git a/packages/opie-keyboard/files/fix-rpath.patch b/packages/opie-keyboard/files/fix-rpath.patch
new file mode 100644
index 0000000000..d917aeb609
--- /dev/null
+++ b/packages/opie-keyboard/files/fix-rpath.patch
@@ -0,0 +1,13 @@
+diff --git a/keyboard.pro b/keyboard.pro
+index 3a9e075..52bc10d 100644
+--- a/keyboard.pro
++++ b/keyboard.pro
+@@ -9,7 +9,7 @@ DESTDIR		= ../../plugins/inputmethods
+ INCLUDEPATH += $(OPIEDIR)/include
+ DEPENDPATH      +=  ../../launcher
+ LIBS            += -lqpe -L$(OPIEDIR)/plugins/inputmethods -lqpickboard
+-QMAKE_LFLAGS	+= -Wl,-rpath,/opt/QtPalmtop/plugins/inputmethods
++QMAKE_LFLAGS	+= -Wl,-rpath,${palmtopdir}/plugins/inputmethods
+ VERSION		= 1.0.0
+ 
+ include( $(OPIEDIR)/include.pro )
diff --git a/packages/opie-keyboard/opie-keyboard.inc b/packages/opie-keyboard/opie-keyboard.inc
index d99b02ab80..122e30f38e 100644
--- a/packages/opie-keyboard/opie-keyboard.inc
+++ b/packages/opie-keyboard/opie-keyboard.inc
@@ -14,7 +14,7 @@ pkg_postinst() {
 #!/bin/sh
 if [ -n "$D" ]; then exit 1; fi
 if pidof -s qpe >/dev/null; then
-  /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadInputMethods()"
+  ${bindir}/qcop QPE/TaskBar "reloadInputMethods()"
 else
   exit 0
 fi
@@ -24,7 +24,7 @@ fi
 pkg_postrm() {
 #!/bin/sh
 if [ -n "$D" ]; then exit 1; fi
-/opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadInputMethods()"
+${bindir}/qcop QPE/TaskBar "reloadInputMethods()"
 }
 
 # FILES plugins/inputmethods/libqkeyboard.so*
diff --git a/packages/opie-keyboard/opie-keyboard_cvs.bb b/packages/opie-keyboard/opie-keyboard_cvs.bb
index 0e6f66710e..e2cdeef495 100644
--- a/packages/opie-keyboard/opie-keyboard_cvs.bb
+++ b/packages/opie-keyboard/opie-keyboard_cvs.bb
@@ -1,5 +1,7 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
+PR = "r1"
 
-SRC_URI = "${HANDHELDS_CVS};module=opie/inputmethods/keyboard "
+SRC_URI = "${HANDHELDS_CVS};module=opie/inputmethods/keyboard \
+	file://fix-rpath.patch;patch=1 "
diff --git a/packages/opie-keyview/opie-keyview.inc b/packages/opie-keyview/opie-keyview.inc
index 0fa8b683bc..904d781ee1 100644
--- a/packages/opie-keyview/opie-keyview.inc
+++ b/packages/opie-keyview/opie-keyview.inc
@@ -13,7 +13,7 @@ pkg_postinst() {
 #!/bin/sh
 if [ -n "$D" ]; then exit 1; fi
 if pidof -s qpe >/dev/null; then
-  /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadInputMethods()"
+  ${bindir}/qcop QPE/TaskBar "reloadInputMethods()"
 else
   exit 0
 fi
@@ -21,7 +21,7 @@ fi
 
 pkg_postrm() {
 #!/bin/sh
-/opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadInputMethods()"
+${bindir}/qcop QPE/TaskBar "reloadInputMethods()"
 }
 
 # FILES plugins/inputmethods/libkeyview.so*
diff --git a/packages/opie-keyview/opie-keyview_cvs.bb b/packages/opie-keyview/opie-keyview_cvs.bb
index f8bfff4b4b..5a806c6c62 100644
--- a/packages/opie-keyview/opie-keyview_cvs.bb
+++ b/packages/opie-keyview/opie-keyview_cvs.bb
@@ -1,5 +1,6 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/development/keyview "
diff --git a/packages/opie-lockapplet/opie-lockapplet.inc b/packages/opie-lockapplet/opie-lockapplet.inc
index b09673047e..a71078dd67 100644
--- a/packages/opie-lockapplet/opie-lockapplet.inc
+++ b/packages/opie-lockapplet/opie-lockapplet.inc
@@ -15,13 +15,13 @@ 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()"
+  ${bindir}/qcop QPE/TaskBar "reloadApplets()"
 fi
 }
 
 pkg_postrm() {
 #!/bin/sh
-/opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
+${bindir}/qcop QPE/TaskBar "reloadApplets()"
  if [ -n "$D" ]; then false; fi
 }
 
diff --git a/packages/opie-lockapplet/opie-lockapplet_cvs.bb b/packages/opie-lockapplet/opie-lockapplet_cvs.bb
index 6195ed07ac..6ff0588118 100644
--- a/packages/opie-lockapplet/opie-lockapplet_cvs.bb
+++ b/packages/opie-lockapplet/opie-lockapplet_cvs.bb
@@ -1,6 +1,7 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/lockapplet \
            ${HANDHELDS_CVS};module=opie/pics "
diff --git a/packages/opie-mailapplet/opie-mailapplet_cvs.bb b/packages/opie-mailapplet/opie-mailapplet_cvs.bb
index 75785868ef..b20bbd0217 100644
--- a/packages/opie-mailapplet/opie-mailapplet_cvs.bb
+++ b/packages/opie-mailapplet/opie-mailapplet_cvs.bb
@@ -1,6 +1,7 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
+PR = "r2"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/mail/taskbarapplet \
            ${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_cvs.bb b/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_cvs.bb
index 9edc355d68..4fafc8f530 100644
--- a/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_cvs.bb
+++ b/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_cvs.bb
@@ -1,7 +1,7 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
-PR = "r1"
+PR = "r3"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/multimedia/opieplayer \
 	   file://libmadplugin.pro"
diff --git a/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_cvs.bb b/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_cvs.bb
index 459f59debe..0fd327d126 100644
--- a/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_cvs.bb
+++ b/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_cvs.bb
@@ -1,7 +1,7 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
-PR = "r1"
+PR = "r3"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/multimedia/opieplayer \
 	   file://vorbis.pro "
diff --git a/packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_cvs.bb b/packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_cvs.bb
index 427793481e..ca4c49ee3a 100644
--- a/packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_cvs.bb
+++ b/packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_cvs.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
-PR = "r1"
+PR = "r3"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/multimedia/opieplayer "
diff --git a/packages/opie-memoryapplet/opie-memoryapplet.inc b/packages/opie-memoryapplet/opie-memoryapplet.inc
index b67321412f..72348e1bdb 100644
--- a/packages/opie-memoryapplet/opie-memoryapplet.inc
+++ b/packages/opie-memoryapplet/opie-memoryapplet.inc
@@ -13,13 +13,13 @@ 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()"
+  ${bindir}/qcop QPE/TaskBar "reloadApplets()"
 fi
 }
 
 pkg_postrm() {
 #!/bin/sh
-/opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
+${bindir}/qcop QPE/TaskBar "reloadApplets()"
  if [ -n "$D" ]; then false; fi
 }
 
diff --git a/packages/opie-memoryapplet/opie-memoryapplet_cvs.bb b/packages/opie-memoryapplet/opie-memoryapplet_cvs.bb
index 3b686324f6..d0802ad986 100644
--- a/packages/opie-memoryapplet/opie-memoryapplet_cvs.bb
+++ b/packages/opie-memoryapplet/opie-memoryapplet_cvs.bb
@@ -1,6 +1,7 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/applets/memoryapplet \
            ${HANDHELDS_CVS};module=opie/noncore/settings/sysinfo \
diff --git a/packages/opie-multikey/opie-multikey.inc b/packages/opie-multikey/opie-multikey.inc
index 9676111efa..3754e48896 100644
--- a/packages/opie-multikey/opie-multikey.inc
+++ b/packages/opie-multikey/opie-multikey.inc
@@ -15,7 +15,7 @@ pkg_postinst() {
 #!/bin/sh
 if [ -n "$D" ]; then exit 1; fi
 if pidof -s qpe >/dev/null; then
-  /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadInputMethods()"
+  ${bindir}/qcop QPE/TaskBar "reloadInputMethods()"
 else
   exit 0
 fi
@@ -24,7 +24,7 @@ fi
 pkg_postrm() {
 #!/bin/sh
 if [ -n "$D" ]; then exit 1; fi
-/opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadInputMethods()"
+${bindir}/qcop QPE/TaskBar "reloadInputMethods()"
 }
 
 # FILES plugins/inputmethods/libqmultikey.so* share/multikey/*
diff --git a/packages/opie-multikey/opie-multikey_cvs.bb b/packages/opie-multikey/opie-multikey_cvs.bb
index c16c36616b..307f06ae74 100644
--- a/packages/opie-multikey/opie-multikey_cvs.bb
+++ b/packages/opie-multikey/opie-multikey_cvs.bb
@@ -1,7 +1,7 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/inputmethods/multikey \
            ${HANDHELDS_CVS};module=opie/share \
diff --git a/packages/opie-multikeyapplet/opie-multikeyapplet.inc b/packages/opie-multikeyapplet/opie-multikeyapplet.inc
index 6e40790f07..0022ba567a 100644
--- a/packages/opie-multikeyapplet/opie-multikeyapplet.inc
+++ b/packages/opie-multikeyapplet/opie-multikeyapplet.inc
@@ -13,13 +13,13 @@ 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()"
+  ${bindir}/qcop QPE/TaskBar "reloadApplets()"
 fi
 }
 
 pkg_postrm() {
 #!/bin/sh
-/opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
+${bindir}/qcop QPE/TaskBar "reloadApplets()"
  if [ -n "$D" ]; then false; fi
 }
 
diff --git a/packages/opie-multikeyapplet/opie-multikeyapplet_cvs.bb b/packages/opie-multikeyapplet/opie-multikeyapplet_cvs.bb
index 4c26c30395..000f5b5e05 100644
--- a/packages/opie-multikeyapplet/opie-multikeyapplet_cvs.bb
+++ b/packages/opie-multikeyapplet/opie-multikeyapplet_cvs.bb
@@ -1,6 +1,7 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/multikeyapplet \
            ${HANDHELDS_CVS};module=opie/apps"
diff --git a/packages/opie-pcmciaapplet/opie-pcmciaapplet.inc b/packages/opie-pcmciaapplet/opie-pcmciaapplet.inc
index 11b93eed0f..6ed1908029 100644
--- a/packages/opie-pcmciaapplet/opie-pcmciaapplet.inc
+++ b/packages/opie-pcmciaapplet/opie-pcmciaapplet.inc
@@ -12,7 +12,7 @@ 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()"
+  ${bindir}/qcop QPE/TaskBar "reloadApplets()"
 else
   exit 0
 fi
@@ -21,7 +21,7 @@ fi
 pkg_postrm() {
 #!/bin/sh
 if [ -n "$D" ]; then exit 1; fi
-/opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
+${bindir}/qcop QPE/TaskBar "reloadApplets()"
 }
 
 do_install() {
diff --git a/packages/opie-pcmciaapplet/opie-pcmciaapplet_cvs.bb b/packages/opie-pcmciaapplet/opie-pcmciaapplet_cvs.bb
index ec2bc0230e..eb0976f8d0 100644
--- a/packages/opie-pcmciaapplet/opie-pcmciaapplet_cvs.bb
+++ b/packages/opie-pcmciaapplet/opie-pcmciaapplet_cvs.bb
@@ -1,6 +1,7 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/applets/pcmcia \
 	   ${HANDHELDS_CVS};module=opie/pics"
diff --git a/packages/opie-pickboard/opie-pickboard.inc b/packages/opie-pickboard/opie-pickboard.inc
index 37866ceef1..2b81a50104 100644
--- a/packages/opie-pickboard/opie-pickboard.inc
+++ b/packages/opie-pickboard/opie-pickboard.inc
@@ -12,7 +12,7 @@ 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()"
+  ${bindir}/qcop QPE/TaskBar "reloadApplets()"
 else
   exit 0
 fi
@@ -21,7 +21,7 @@ fi
 pkg_postrm() {
 #!/bin/sh
 if [ -n "$D" ]; then exit 1; fi
-/opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadInputMethods()"
+${bindir}/qcop QPE/TaskBar "reloadInputMethods()"
 }
 
 
diff --git a/packages/opie-pickboard/opie-pickboard_cvs.bb b/packages/opie-pickboard/opie-pickboard_cvs.bb
index 4f778f135d..368f265e95 100644
--- a/packages/opie-pickboard/opie-pickboard_cvs.bb
+++ b/packages/opie-pickboard/opie-pickboard_cvs.bb
@@ -1,5 +1,6 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/inputmethods/pickboard"
diff --git a/packages/opie-screenshotapplet/opie-screenshotapplet.inc b/packages/opie-screenshotapplet/opie-screenshotapplet.inc
index a8872609f5..b8c94067fd 100644
--- a/packages/opie-screenshotapplet/opie-screenshotapplet.inc
+++ b/packages/opie-screenshotapplet/opie-screenshotapplet.inc
@@ -14,14 +14,14 @@ 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()"
+  ${bindir}/qcop QPE/TaskBar "reloadApplets()"
 fi
 }
 
 pkg_postrm() {
 #!/bin/sh
 if [ -n "$D" ]; then false; fi
-/opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
+${bindir}/qcop QPE/TaskBar "reloadApplets()"
 }
 
 # FILES plugins/applets/libscreenshotapplet.so*
diff --git a/packages/opie-screenshotapplet/opie-screenshotapplet_cvs.bb b/packages/opie-screenshotapplet/opie-screenshotapplet_cvs.bb
index 227fed2d0c..43ce79d570 100644
--- a/packages/opie-screenshotapplet/opie-screenshotapplet_cvs.bb
+++ b/packages/opie-screenshotapplet/opie-screenshotapplet_cvs.bb
@@ -1,6 +1,7 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/screenshotapplet \
            ${HANDHELDS_CVS};module=opie/apps                          \
diff --git a/packages/opie-taskbar/opie-taskbar-images.inc b/packages/opie-taskbar/opie-taskbar-images.inc
index f3cef44835..2e84210718 100644
--- a/packages/opie-taskbar/opie-taskbar-images.inc
+++ b/packages/opie-taskbar/opie-taskbar-images.inc
@@ -28,19 +28,23 @@ do_install() {
 	install -m 0644 ${WORKDIR}/pics/launcher/firstuse.jpg ${D}${palmtopdir}/pics/launcher/firstuse-240x320.jpg
 	install -m 0644 ${WORKDIR}/pics/launcher/opie-background.jpg ${D}${palmtopdir}/pics/launcher/opie-background-240x320.jpg
 
-	install -m 0644 ${WORKDIR}/pics/launcher/firstuse-480x640.jpg ${D}${palmtopdir}/pics/launcher/firstuse-480x640.jpg
-	install -m 0644 ${WORKDIR}/pics/launcher/opie-background-480x640.jpg ${D}${palmtopdir}/pics/launcher/opie-background-480x640.jpg
-
-	install -m 0644 ${WORKDIR}/pics/launcher/firstuse-640x480.jpg ${D}${palmtopdir}/pics/launcher/firstuse-640x480.jpg
-	install -m 0644 ${WORKDIR}/pics/launcher/opie-background-640x480.jpg ${D}${palmtopdir}/pics/launcher/opie-background-640x480.jpg
-
-	install -m 0644 ${WORKDIR}/pics/launcher/firstuse-800x600.jpg ${D}${palmtopdir}/pics/launcher/firstuse-800x600.jpg
-	install -m 0644 ${WORKDIR}/pics/launcher/opie-background-800x600.jpg ${D}${palmtopdir}/pics/launcher/opie-background-800x600.jpg
+        for res in 480x640 640x480 800x600 ; do
+         install -m 0644 ${WORKDIR}/pics/launcher/firstuse-${res}.jpg ${D}${palmtopdir}/pics/launcher/firstuse-${res}.jpg
+         install -m 0644 ${WORKDIR}/pics/launcher/opie-background-${res}.jpg ${D}${palmtopdir}/pics/launcher/opie-background-${res}.jpg
+        done
 }
 
-FILES_${PN}-240x320 += " ${palmtopdir}/pics/*/*-240x320.*"
-FILES_${PN}-480x640 += " ${palmtopdir}/pics/*/*-480x640.*"
-FILES_${PN}-640x480 += " ${palmtopdir}/pics/*/*-640x480.*"
-FILES_${PN}-800x600 += " ${palmtopdir}/pics/*/*-800x600.*"
+python do_package_prepend () {
+        reslist = ['240x320','480x640','640x480', '800x600']
+        dir = bb.data.expand('${palmtopdir}/pics/launcher/', d)
+        ft = bb.data.expand('${palmtopdir}/pics/*/*-%s.*', d)
+        pn = bb.data.getVar('PN', d, 1)
+        for res in reslist:
+         bb.data.setVar('FILES_%s-%s' % (pn,res), ft % res, d )
+         postinst = ''
+         postinst = 'update-alternatives --install %sfirstuse.jpg opie-firstuse-pixmap %sfirstuse-%s.jpg 50\n' % (dir,dir,res)
+         postinst += 'update-alternatives --install %sopie-background.jpg opie-background-pixmap %sopie-background-%s.jpg 50\n' % (dir,dir,res)
+         bb.data.setVar('pkg_postinst_%s-%s' % (pn,res),postinst, d)
+}
 
 PACKAGE_ARCH = "all"
diff --git a/packages/opie-taskbar/opie-taskbar-images_cvs.bb b/packages/opie-taskbar/opie-taskbar-images_cvs.bb
index 0566431474..718160cb4d 100644
--- a/packages/opie-taskbar/opie-taskbar-images_cvs.bb
+++ b/packages/opie-taskbar/opie-taskbar-images_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
 PV = "${OPIE_CVS_PV}"
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/pics"
diff --git a/packages/opie-taskbar/opie-taskbar/restart-from-bindir.patch b/packages/opie-taskbar/opie-taskbar/restart-from-bindir.patch
new file mode 100644
index 0000000000..1a73588409
--- /dev/null
+++ b/packages/opie-taskbar/opie-taskbar/restart-from-bindir.patch
@@ -0,0 +1,12 @@
+diff --git a/serverapp.cpp b/serverapp.cpp
+index 0e92040..b933340 100644
+--- a/serverapp.cpp
++++ b/serverapp.cpp
+@@ -763,6 +763,7 @@ void ServerApplication::restart()
+         for ( int fd = 3; fd < 100; fd++ )
+         close( fd );
+         execl( ( qpeDir() + "/bin/qpe" ).local8Bit(), "qpe", NULL );
++        execl( OPIE_BINDIR "/qpe", "qpe", NULL );
+         exit( 1 );
+ #endif
+     }
diff --git a/packages/opie-taskbar/opie-taskbar_cvs.bb b/packages/opie-taskbar/opie-taskbar_cvs.bb
index 88cfcf90b2..ad3931adc7 100644
--- a/packages/opie-taskbar/opie-taskbar_cvs.bb
+++ b/packages/opie-taskbar/opie-taskbar_cvs.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 PV = "${OPIE_CVS_PV}"
-PR = "r12"
+PR = "r13"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/calibrate \
            ${HANDHELDS_CVS};module=opie/noncore/settings/mediummount \
@@ -13,4 +13,5 @@ SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/calibrate \
            file://no-builtin-qss-startup.patch;patch=1 \
            file://kbdlocks-runtime.patch;patch=1 \
            file://server.pro \
+	   file://restart-from-bindir.patch;patch=1 \
           "
diff --git a/packages/opie-tinykate/opie-tinykate.inc b/packages/opie-tinykate/opie-tinykate.inc
index 7d700cb0dd..fdec301897 100644
--- a/packages/opie-tinykate/opie-tinykate.inc
+++ b/packages/opie-tinykate/opie-tinykate.inc
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 LICENSE = "GPL"
 DEPENDS = "libqtaux2"
 APPNAME = "tinykate"
-PR = "r1"
+PR = "r2"
 
 S = "${WORKDIR}/tinykate"
 
@@ -29,8 +29,7 @@ PACKAGES += " \
 	opie-tinykate-syntax-misc \
 	opie-tinykate-syntax-miscdev \
 	opie-tinykate-syntax-unix \
-	opie-tinykate-syntax-web \
-	opie-tinykate "
+	opie-tinykate-syntax-web "
 
 
 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"
diff --git a/packages/opie-unikeyboard/opie-unikeyboard.inc b/packages/opie-unikeyboard/opie-unikeyboard.inc
index f5d6fdb687..7bdf06d64e 100644
--- a/packages/opie-unikeyboard/opie-unikeyboard.inc
+++ b/packages/opie-unikeyboard/opie-unikeyboard.inc
@@ -13,7 +13,7 @@ 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()"
+  ${bindir}/qcop QPE/TaskBar "reloadApplets()"
 else
   exit 0
 fi
@@ -22,7 +22,7 @@ fi
 pkg_postrm() {
 #!/bin/sh
 if [ -n "$D" ]; then exit 1; fi
-/opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadInputMethods()"
+${bindir}/qcop QPE/TaskBar "reloadInputMethods()"
 }
 
 # FILES plugins/inputmethods/libqunikeyboard.so*
diff --git a/packages/opie-unikeyboard/opie-unikeyboard_cvs.bb b/packages/opie-unikeyboard/opie-unikeyboard_cvs.bb
index c85a6ad7e2..b035a101ed 100644
--- a/packages/opie-unikeyboard/opie-unikeyboard_cvs.bb
+++ b/packages/opie-unikeyboard/opie-unikeyboard_cvs.bb
@@ -1,5 +1,6 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/inputmethods/unikeyboard "
diff --git a/packages/opie-volumeapplet/opie-volumeapplet.inc b/packages/opie-volumeapplet/opie-volumeapplet.inc
index 6509fde926..3bb619f3bd 100644
--- a/packages/opie-volumeapplet/opie-volumeapplet.inc
+++ b/packages/opie-volumeapplet/opie-volumeapplet.inc
@@ -13,13 +13,13 @@ 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()"
+  ${bindir}/qcop QPE/TaskBar "reloadApplets()"
 fi
 }
 
 pkg_postrm() {
 #!/bin/sh
-/opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
+${bindir}/qcop QPE/TaskBar "reloadApplets()"
  if [ -n "$D" ]; then false; fi
 }
 
diff --git a/packages/opie-volumeapplet/opie-volumeapplet_cvs.bb b/packages/opie-volumeapplet/opie-volumeapplet_cvs.bb
index 806f7b77fc..86a47417ed 100644
--- a/packages/opie-volumeapplet/opie-volumeapplet_cvs.bb
+++ b/packages/opie-volumeapplet/opie-volumeapplet_cvs.bb
@@ -1,6 +1,7 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/volumeapplet \
            ${HANDHELDS_CVS};module=opie/apps"
diff --git a/packages/poboxserver/poboxserver/.mtn2git_empty b/packages/poboxserver/poboxserver/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/poboxserver/poboxserver/.mtn2git_empty
diff --git a/packages/poboxserver/files/OpenPOBox-1.25.diff b/packages/poboxserver/poboxserver/OpenPOBox-1.25.diff
index d3add6d79c..d3add6d79c 100644
--- a/packages/poboxserver/files/OpenPOBox-1.25.diff
+++ b/packages/poboxserver/poboxserver/OpenPOBox-1.25.diff
diff --git a/packages/poboxserver/files/pbserver.sh b/packages/poboxserver/poboxserver/pbserver.sh
index 8e5a1bda26..8e5a1bda26 100644
--- a/packages/poboxserver/files/pbserver.sh
+++ b/packages/poboxserver/poboxserver/pbserver.sh
diff --git a/packages/poboxserver/files/remove-local-includes.patch b/packages/poboxserver/poboxserver/remove-local-includes.patch
index 10f9d312d6..10f9d312d6 100644
--- a/packages/poboxserver/files/remove-local-includes.patch
+++ b/packages/poboxserver/poboxserver/remove-local-includes.patch
diff --git a/packages/poboxserver/poboxserver/unicode.patch b/packages/poboxserver/poboxserver/unicode.patch
new file mode 100644
index 0000000000..884070a3c8
--- /dev/null
+++ b/packages/poboxserver/poboxserver/unicode.patch
@@ -0,0 +1,13 @@
+diff --git a/../pbserver/Makefile b/../pbserver/Makefile
+index 27847c1..d6ffff3 100755
+--- a/../pbserver/Makefile
++++ b/../pbserver/Makefile
+@@ -15,7 +15,7 @@ configure:
+ dic:	staticdic learndic
+ 
+ staticdic:	fugodic.txt
+-	nkf -e $< | ruby dicfilter.rb | sort |uniq > $@
++	nkf -w $< | ruby dicfilter.rb | sort |uniq > $@
+ 
+ learndic:
+ 	touch $@
diff --git a/packages/poboxserver/poboxserver_1.2.5.bb b/packages/poboxserver/poboxserver_1.2.5.bb
index e582ce0ccf..b7e2ed7179 100644
--- a/packages/poboxserver/poboxserver_1.2.5.bb
+++ b/packages/poboxserver/poboxserver_1.2.5.bb
@@ -2,12 +2,13 @@ DESCRIPTION = "OpenPOBox is an open source implementation of a 'Predictive Opera
 SECTION = "inputmethods"
 LICENSE = "GPL"
 DEPENDS = "perl-native ruby-native nkf-native"
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/gakusei/pobox-${PV}.tar.bz2 \
            http://www.vanille.de/mirror/pbserver-${PV}.tar.gz \
            file://OpenPOBox-1.25.diff;patch=1 \
            file://remove-local-includes.patch;patch=1 \
+           file://unicode.patch;patch=1 \
            file://pbserver.sh"
 S = "${WORKDIR}/OpenPOBox"
 
diff --git a/packages/poboxserver/qpobox/.mtn2git_empty b/packages/poboxserver/qpobox/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/poboxserver/qpobox/.mtn2git_empty
diff --git a/packages/qpobox/files/qpobox-0.5.4-opie.patch b/packages/poboxserver/qpobox/qpobox-0.5.4-opie.patch
index 91b9db712a..91b9db712a 100644
--- a/packages/qpobox/files/qpobox-0.5.4-opie.patch
+++ b/packages/poboxserver/qpobox/qpobox-0.5.4-opie.patch
diff --git a/packages/qpobox/files/qpobox.patch b/packages/poboxserver/qpobox/qpobox.patch
index eb2549ecb6..9ed8f6c6b0 100644
--- a/packages/qpobox/files/qpobox.patch
+++ b/packages/poboxserver/qpobox/qpobox.patch
@@ -7,7 +7,7 @@ diff -Naur qpobox.orig/pbclient.cpp qpobox/pbclient.cpp
    m_sock = new QSocket(this);
 -  m_conv = QTextCodec::codecForName("EUC-JP");
 +  //m_conv = QTextCodec::codecForName("EUC-JP");
-+  m_conv = QTextCodec::codecForName("eucJP");
++  m_conv = QTextCodec::codecForName("utf8");
  
    connect(m_sock, SIGNAL(readyRead()), this, SLOT(socketReadyRead()));
    connect(m_sock, SIGNAL(error(int)), this, SLOT(socketError(int)));
diff --git a/packages/qpobox/qpobox_0.5.4.bb b/packages/poboxserver/qpobox_0.5.4.bb
index 002522afa3..9bb8c34523 100644
--- a/packages/qpobox/qpobox_0.5.4.bb
+++ b/packages/poboxserver/qpobox_0.5.4.bb
@@ -3,7 +3,7 @@ SECTION = "opie/inputmethods"
 RDEPENDS = "poboxserver virtual/japanese-font"
 LICENSE = "GPL"
 HOMEPAGE = "http://takahr.dhis.portside.net/cgi-bin/rwiki.cgi?cmd=view;name=QPOBox"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "http://www.vanille.de/mirror/qpobox-${PV}.tar.gz \
            file://qpobox-0.5.4-opie.patch;patch=1 \
diff --git a/packages/qpf-fonts/files/update-qtfontdir b/packages/qpf-fonts/files/update-qtfontdir
index 857dc6c0d5..34f2ffd825 100755
--- a/packages/qpf-fonts/files/update-qtfontdir
+++ b/packages/qpf-fonts/files/update-qtfontdir
@@ -41,7 +41,7 @@ if [ -z "$1" ]; then
 	if [ -n "$QTDIR" ]; then
 		fontdir=$QTDIR/lib/fonts
 	else
-		fontdir=/opt/QtPalmtop/lib/fonts
+		fontdir=@palmtopdir@/lib/fonts
 	fi
 else
 	fontdir=$1
diff --git a/packages/qpf-fonts/qpf-font-common_1.0.bb b/packages/qpf-fonts/qpf-font-common_1.0.bb
index 306fa22201..41bdad0a4a 100644
--- a/packages/qpf-fonts/qpf-font-common_1.0.bb
+++ b/packages/qpf-fonts/qpf-font-common_1.0.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Qt/Embedded Fonts Common Files"
 SECTION = "opie/fonts"
 PRIORITY = "optional"
 LICENSE = "GPL QPL"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "file://update-qtfontdir"
 S = "${WORKDIR}/qt-${PV}"
@@ -10,4 +10,5 @@ S = "${WORKDIR}/qt-${PV}"
 do_install() {
 	install -d ${D}${sbindir}/
 	install -m 0755 ${WORKDIR}/update-qtfontdir ${D}${sbindir}/
+	sed -i -e 's,@palmtopdir@,${palmtopdir},g' ${D}${sbindir}/update-qtfontdir
 }
diff --git a/packages/qte/qte-2.3.10/c7x0-w100-gcc4.patch b/packages/qte/qte-2.3.10/c7x0-w100-gcc4.patch
new file mode 100644
index 0000000000..101f9596b0
--- /dev/null
+++ b/packages/qte/qte-2.3.10/c7x0-w100-gcc4.patch
@@ -0,0 +1,31 @@
+diff --git a/src/kernel/qgfxw100_qws.cpp b/src/kernel/qgfxw100_qws.cpp
+index cbc42d6..b5dfe31 100644
+--- a/src/kernel/qgfxw100_qws.cpp
++++ b/src/kernel/qgfxw100_qws.cpp
+@@ -1250,7 +1250,7 @@ void QGfxW100< depth, type>::dDrawPolyline( const QPointArray &a,
+     points[ npoints ] = points[ npoints - 1 ];
+ 
+ 
+-    GFX_START( clipbounds );
++    GFX_START( this->clipbounds );
+     driver.setFrgColour( this->cpen.color().rgb() );
+     driver.setRopOperation( ROP3_PATCOPY );
+     for ( int loopc = 0; loopc < this->ncliprect; loopc++ ) {
+@@ -1341,7 +1341,7 @@ void QGfxW100< depth, type>::dDrawPoint( int x, int y )
+     point.XCoord = x + this->xoffs;
+     point.YCoord = y + this->yoffs;
+ 
+-    GFX_START( clipbounds );
++    GFX_START( this->clipbounds );
+     driver.setFrgColour( this->cpen.color().rgb() );
+     driver.setRopOperation( ROP3_PATCOPY );
+     for ( int loopc = 0; loopc < this->ncliprect; loopc++ ) {
+@@ -1413,7 +1413,7 @@ void QGfxW100< depth, type>::dDrawPoints( const QPointArray &a,
+         points[i].YCoord = a[i+index].y() + this->yoffs;
+     }
+ 
+-    GFX_START( clipbounds );
++    GFX_START( this->clipbounds );
+     driver.setFrgColour( this->cpen.color().rgb() );
+     driver.setRopOperation( ROP3_PATCOPY );
+     for ( int loopc = 0; loopc < this->ncliprect; loopc++ ) {
diff --git a/packages/qte/qte-common_2.3.10.inc b/packages/qte/qte-common_2.3.10.inc
index d0e3795d68..dbdf21e1b3 100644
--- a/packages/qte/qte-common_2.3.10.inc
+++ b/packages/qte/qte-common_2.3.10.inc
@@ -56,7 +56,8 @@ SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}-free.tar.gz;m
 #
 SRC_URI_append_simpad       = "file://devfs.patch;patch=1 "
 SRC_URI_append_c7x0         = "file://kernel-keymap-corgi.patch;patch=1 \
-                               file://c7x0-w100-accel.patch;patch=1 file://suspend-resume-hooks.patch;patch=1 "
+                               file://c7x0-w100-accel.patch;patch=1 file://suspend-resume-hooks.patch;patch=1 \
+                               file://c7x0-w100-gcc4.patch;patch=1 "
 SRC_URI_append_spitz        = "file://kernel-keymap-corgi.patch;patch=1 \
                                file://kernel-keymap-CXK.patch;patch=1 "
 SRC_URI_append_akita        = "file://kernel-keymap-corgi.patch;patch=1 \
diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb
index 1ef70f63cd..c7dbf15388 100644
--- a/packages/tasks/task-base.bb
+++ b/packages/tasks/task-base.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
-PR = "r38"
+PR = "r39"
 
 DEPENDS = "task-boot"
 PROVIDES = "${PACKAGES}"
@@ -239,7 +239,11 @@ RRECOMMENDS_task-base-bluetooth = "\
     ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'kernel-module-bluetooth3c-cs', '',d)} \
     ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'kernel-module-bluecard-cs', '',d)} \
     ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'kernel-module-bluetoothuart-cs', '',d)} \
-    ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'kernel-module-dtl1-cs', '',d)}"
+    ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'kernel-module-dtl1-cs', '',d)} \
+    ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'bluez-dtl1-workaround', '',d)} \
+    "
+# bluez-dtl1-workaround above is workaround for bitbake not handling DEPENDS on it in
+# kernel.bbclass. It should be there as long as kernel-module-dtl1-cs is, but not longer.
 
 RDEPENDS_task-base-irda = "\
     irda-utils"