merge of '6ecc6574ba0db38196a290448aaaf3706bcacee3'

     and '7314baf01ff720449ddb034e256e260501df588f'

60 files changed, 412 insertions, 440 deletions

diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass
index 4cc3784b6f..658bbbf675 100644
--- a/classes/kernel.bbclass
+++ b/classes/kernel.bbclass
@@ -183,6 +183,11 @@ ALLOW_EMPTY_kernel = "1"
 ALLOW_EMPTY_kernel-base = "1"
 ALLOW_EMPTY_kernel-image = "1"
 
+# Userspace workarounds for kernel modules issues
+# This is shame, fix the kernel instead!
+DEPENDS_kernel-module-dtl1-cs = "bluez-dtl1-workaround"
+RDEPENDS_kernel-module-dtl1-cs = "bluez-dtl1-workaround"
+
 pkg_postinst_kernel-image () {
 if [ ! -e "$D/lib/modules/${KERNEL_VERSION}" ]; then
 	mkdir -p $D/lib/modules/${KERNEL_VERSION}
diff --git a/classes/opie.bbclass b/classes/opie.bbclass
index 916a8a4a30..c11cf0b4de 100644
--- a/classes/opie.bbclass
+++ b/classes/opie.bbclass
@@ -80,6 +80,7 @@ python opie_do_opie_install() {
 	D = "%s/image" % bb.data.getVar( "WORKDIR", d, True )
 	WORKDIR = bb.data.getVar( "WORKDIR", d, True )
 	palmtopdir = bb.data.getVar( "palmtopdir", d, True )
+	gnubindir = bb.data.getVar( "bindir", d, True )
 	APPDESKTOP = bb.data.getVar( "APPDESKTOP", d, True ) or "%s/%s" % ( WORKDIR, desktopdir )
 
 	if desktopdir is not None:
@@ -89,11 +90,12 @@ python opie_do_opie_install() {
 	os.system( "install -d %s%s%s/" % ( D, palmtopdir, bindir ) )
 
 	if APPTYPE == "binary":
-		os.system( "install -m 0755 %s/%s %s%s%s/" % ( S, APPNAME, D, palmtopdir, bindir ) )
+		os.system( "install -d %s%s/" % ( D, gnubindir ) )
+		os.system( "install -m 0755 %s/%s %s%s/" % ( S, APPNAME, D, gnubindir ) )
 	elif APPTYPE == "quicklaunch":
 		os.system( "install -m 0755 %s/lib%s.so %s%s%s/" % ( S, APPNAME, D, palmtopdir, bindir ) )
-		os.system( "install -d %s%s/bin/" % ( D, palmtopdir ) )
-		os.system( "ln -sf %s/bin/quicklauncher %s%s/bin/%s" % ( palmtopdir, D, palmtopdir, APPNAME ) )
+		os.system( "install -d %s%s/" % ( D, gnubindir ) )
+		os.system( "ln -sf %s/quicklauncher %s%s/%s" % ( gnubindir, D, gnubindir, APPNAME ) )
 	elif APPTYPE == "plugin":
 		os.system( "install -m 0755 %s/lib%s.so %s%s%s/" % ( S, APPNAME, D, palmtopdir, bindir ) )
 }
diff --git a/classes/palmtop.bbclass b/classes/palmtop.bbclass
index e99b31aaa3..fa25d598e9 100644
--- a/classes/palmtop.bbclass
+++ b/classes/palmtop.bbclass
@@ -19,8 +19,7 @@ DEPENDS_prepend = "${@["virtual/libqpe1 uicmoc-native ", ""][(bb.data.getVar('PN
 QT_LIBRARY = '${@base_conditional("PALMTOP_USE_MULTITHREADED_QT", "yes", "qte-mt", "qte", d)}'
 
 PACKAGES = "${PN}-dbg ${PN}-dev ${PN} ${PN}-doc ${PN}-locale"
-FILES_${PN} = " ${palmtopdir} "
-FILES_${PN}-dev += " ${palmtopdir}/lib/lib*.so "
+FILES_${PN} += " ${palmtopdir} "
 FILES_${PN}-dbg += " ${palmtopdir}/lib/.debug \
                      ${palmtopdir}/bin/.debug \
                      ${palmtopdir}/plugins/*/.debug "
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 38561149d7..a4dd4b18a8 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -319,8 +319,8 @@ BOOTSTRAP_EXTRA_RRECOMMENDS = ""
 export QTDIR = "${STAGING_DIR}/${HOST_SYS}/qt2"
 export QPEDIR = "${STAGING_DIR}/${HOST_SYS}"
 export OPIEDIR = "${STAGING_DIR}/${HOST_SYS}"
-export palmtopdir = "${prefix}"
-export palmqtdir = "${prefix}"
+export palmtopdir = "${libdir}/opie"
+export palmqtdir = "${palmtopdir}"
 
 ##################################################################
 # Download locations and utilities.
diff --git a/conf/distro/include/preferred-opie-versions-1.2.3-pre.inc b/conf/distro/include/preferred-opie-versions-1.2.3-pre.inc
index 4d422ca537..fe71a6ab90 100644
--- a/conf/distro/include/preferred-opie-versions-1.2.3-pre.inc
+++ b/conf/distro/include/preferred-opie-versions-1.2.3-pre.inc
@@ -3,7 +3,7 @@
 QTE_VERSION ?= "2.3.10"
 PALMTOP_USE_MULTITHREADED_QT ?= "yes"
 
-OPIE_SRCDATE ?= "20070702"
+OPIE_SRCDATE ?= "20070703"
 OPIE_VERSION ?= "1.2.2+cvs${OPIE_SRCDATE}"
 OPIE_CVS_PV ?= "1.2.2+cvs${OPIE_SRCDATE}"
 
diff --git a/conf/machine/h2200.conf b/conf/machine/h2200.conf
index 6c43e75625..56f1d17c04 100644
--- a/conf/machine/h2200.conf
+++ b/conf/machine/h2200.conf
@@ -26,7 +26,7 @@ PCMCIA_MANAGER = "pcmciautils"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6"
 
-MACHINE_EXTRA_RDEPENDS = "h2200-bootloader"
+MACHINE_EXTRA_RDEPENDS = "h2200-bootloader udev-hostap-cs-vcc-workaround"
 EXTRA_IMAGECMD_jffs2 = "--pad --eraseblock=0x4000"
 
 #
diff --git a/packages/bluez/bluez-dtl1-workaround_1.0.bb b/packages/bluez/bluez-dtl1-workaround_1.0.bb
new file mode 100644
index 0000000000..413d220508
--- /dev/null
+++ b/packages/bluez/bluez-dtl1-workaround_1.0.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "A nasty hack for for dtl1-cs driver to workaround suspend/resume."
+SECTION = "console" 
+PRIORITY = "optional" 
+LICENSE = "GPL" 
+PR = "r1"
+ 
+SRC_URI = "file://02dtl1_cs.sh"
+
+do_install() { 
+        install -d ${D}${sysconfdir}/apm/event.d/ 
+        install -m 0755 ${WORKDIR}/02dtl1_cs.sh ${D}${sysconfdir}/apm/event.d/ 
+} 
+
+#Package 02dtl1_cs.sh, which is a nasty hack to get dtl1c_cs cards working with suspend/resume
+FILES_${PN} += "${sysconfdir}/apm/"
+
+PACKAGE_ARCH = "all"
diff --git a/packages/bluez/bluez-utils.inc b/packages/bluez/bluez-utils.inc
index b6f9660fa7..8eb4fbfbf0 100644
--- a/packages/bluez/bluez-utils.inc
+++ b/packages/bluez/bluez-utils.inc
@@ -10,7 +10,6 @@ LICENSE = "GPL"
 
 SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \
 	file://hcid.conf \
-	file://02dtl1_cs.sh \
 	file://hciattach-ti-bts.patch;patch=1 \
         file://handle-eintr.patch;patch=1;status=applied"
 
@@ -41,7 +40,6 @@ do_install_append() {
 	rmdir ${D}${bindir} ${D}${sbindir}
 	chmod u+s ${D}${base_sbindir}/hciattach ${D}${base_sbindir}/hciconfig
 	install -m 0644 ${WORKDIR}/hcid.conf ${D}${sysconfdir}/bluetooth/
-	install -m 0755 ${WORKDIR}/02dtl1_cs.sh ${D}${sysconfdir}/apm/event.d/
         install -m 0755 ${S}/daemon/.libs/passkey-agent ${D}${base_bindir}/
 }
 
diff --git a/packages/bluez/bluez-utils/02dtl1_cs.sh b/packages/bluez/bluez-utils/02dtl1_cs.sh
deleted file mode 100644
index fd81508010..0000000000
--- a/packages/bluez/bluez-utils/02dtl1_cs.sh
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/bin/sh
-
-case "$1" in
-	suspend)
-		if [ "`/bin/hciconfig`" != "" ]; then
-			#If hciconfig outputs anything then there's probably a Bluetooth
-			# CF card in the slot so shut it down.
-			hcitool dc `hcitool con | grep ACL | sed 's/^.*\([0-9A-F]\{2\}\(:[0-9A-F]\{2\}\)\{5\}\).*$/\1/'`
-			hciconfig hci0 down
-			killall hciattach > /dev/null 2>&1 
-		fi 
-		;;
-
-	resume)
-		#check for kernel version
-		if [ "`uname -r | grep 2.4.`" != "" ]; then
-			k="o"
-		elif [ "`uname -r | grep 2.6.`" != "" ]; then
-			k="ko"
-		else
-			exit 0
-		fi
-
-		if test -e /sbin/cardctl; then
-			CARDCTL=/sbin/cardctl
-		elif test -e /sbin/pccardctl; then
-			CARDCTL=/sbin/pccardctl
-		else
-			exit 0
-		fi
-
-		if [ "`lsmod | grep hci_uart`" != "" ]; then
-			#If the hci_usb module is still loaded then there's a serial based
-			# Bluetooth CF card in the slot, which only needs a resume to get it going
-			# again. 
-			rfcomm bind all
-			$CARDCTL resume
-			hciconfig hci0 up
-		else
-			# only works for nokia dtl1 cards
-			for f in /lib/modules/`uname -r`/kernel/drivers/bluetooth/dtl1_cs.$k
-			do
-				#Enumerate all the self-contained Bluetooth CF card drivers
-				f=`echo $f | sed 's/\.'$k'$//'`
-				f=`basename $f`
-				if [ "`lsmod | grep $f`" != "" ]; then
-					#If one of these drivers is still loaded, then there is probably
-					#a non-serial based Bluetooth CF card in the slot that needs
-					#ejecting and reinserting to get it going again
-					rfcomm bind all
-					$CARDCTL eject
-					$CARDCTL insert
-					hciconfig hci0 up
-				fi
-			done
-		fi
-esac
diff --git a/packages/bluez/bluez-utils_3.11.bb b/packages/bluez/bluez-utils_3.11.bb
index 2419f431f6..6cadfc1a53 100644
--- a/packages/bluez/bluez-utils_3.11.bb
+++ b/packages/bluez/bluez-utils_3.11.bb
@@ -6,9 +6,8 @@ DEPENDS += "glib-2.0"
 
 SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \
            file://hcid.conf \
-           file://02dtl1_cs.sh \
           "
-PR = "r0"
+PR = "r1"
 
 EXTRA_OECONF = " \
                  --enable-bccmd \
@@ -84,9 +83,6 @@ FILES_${PN} = " \
 	       ${base_sbindir}/hciattach \
               "
 
-#Package 02dtl1_cs.sh, which is a nasty hack to get dtl1c_cs cards working with suspend/resume 
-FILES_${PN} += "${sysconfdir}/apm/"
-
 FILES_${PN}-dbg += " \
                    ${libdir}/bluetooth/.debug \
 		  " 
diff --git a/packages/bluez/bluez-utils_3.12.bb b/packages/bluez/bluez-utils_3.12.bb
index e543eed649..4710aa6779 100644
--- a/packages/bluez/bluez-utils_3.12.bb
+++ b/packages/bluez/bluez-utils_3.12.bb
@@ -4,9 +4,8 @@ DEPENDS += "glib-2.0"
 
 SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \
            file://hcid.conf \
-           file://02dtl1_cs.sh \
           "
-PR = "r2"
+PR = "r3"
 
 EXTRA_OECONF = " \
                  --enable-bccmd \
@@ -82,9 +81,6 @@ FILES_${PN} = " \
 	       ${base_sbindir}/hciattach \
               "
 
-#Package 02dtl1_cs.sh, which is a nasty hack to get dtl1c_cs cards working with suspend/resume 
-FILES_${PN} += "${sysconfdir}/apm/"
-
 FILES_${PN}-dbg += " \
                    ${libdir}/bluetooth/.debug \
 		  " 
diff --git a/packages/bluez/bluez-utils_3.4.bb b/packages/bluez/bluez-utils_3.4.bb
index 49e6ded250..f2bbd15507 100644
--- a/packages/bluez/bluez-utils_3.4.bb
+++ b/packages/bluez/bluez-utils_3.4.bb
@@ -11,7 +11,6 @@ PR = "r1"
 
 SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \
 	file://hcid.conf \
-	file://02dtl1_cs.sh \
 	file://hciattach-ti-bts.patch;patch=1"
 
 # Almost all serial CF cards w/ manfid 0x0000,0x0000 seem to use the bcs protocol
@@ -41,7 +40,6 @@ do_install_append() {
 	rmdir ${D}${bindir} ${D}${sbindir}
 	chmod u+s ${D}${base_sbindir}/hciattach ${D}${base_sbindir}/hciconfig
 	install -m 0644 ${WORKDIR}/hcid.conf ${D}${sysconfdir}/bluetooth/
-	install -m 0755 ${WORKDIR}/02dtl1_cs.sh ${D}${sysconfdir}/apm/event.d/
 }
 
 CONFFILES_${PN} = "${sysconfdir}/bluetooth/hcid.conf ${sysconfdir}/bluetooth/rfcomm.conf \
diff --git a/packages/bluez/bluez-utils_3.7.bb b/packages/bluez/bluez-utils_3.7.bb
index 3dbaa030c1..7a76cb3200 100644
--- a/packages/bluez/bluez-utils_3.7.bb
+++ b/packages/bluez/bluez-utils_3.7.bb
@@ -11,7 +11,6 @@ PR = "r0"
 
 SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \
 	file://hcid.conf \
-	file://02dtl1_cs.sh \
 	file://hciattach-ti-bts.patch;patch=1"
 
 # Almost all serial CF cards w/ manfid 0x0000,0x0000 seem to use the bcs protocol
@@ -41,7 +40,6 @@ do_install_append() {
 	rmdir ${D}${bindir} ${D}${sbindir}
 	chmod u+s ${D}${base_sbindir}/hciattach ${D}${base_sbindir}/hciconfig
 	install -m 0644 ${WORKDIR}/hcid.conf ${D}${sysconfdir}/bluetooth/
-	install -m 0755 ${WORKDIR}/02dtl1_cs.sh ${D}${sysconfdir}/apm/event.d/
 }
 
 CONFFILES_${PN} = "${sysconfdir}/bluetooth/hcid.conf ${sysconfdir}/bluetooth/rfcomm.conf \
diff --git a/packages/bluez/bluez-utils_3.8.bb b/packages/bluez/bluez-utils_3.8.bb
index d549d12d30..f2bbd15507 100644
--- a/packages/bluez/bluez-utils_3.8.bb
+++ b/packages/bluez/bluez-utils_3.8.bb
@@ -7,11 +7,10 @@ RPROVIDES_${PN} = "bluez-pan bluez-sdp bluez-utils-dbus"
 RREPLACES = "bluez-utils-dbus"
 RCONFLICTS_${PN} = "bluez-utils-nodbus"
 LICENSE = "GPL"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \
 	file://hcid.conf \
-	file://02dtl1_cs.sh \
 	file://hciattach-ti-bts.patch;patch=1"
 
 # Almost all serial CF cards w/ manfid 0x0000,0x0000 seem to use the bcs protocol
@@ -41,7 +40,6 @@ do_install_append() {
 	rmdir ${D}${bindir} ${D}${sbindir}
 	chmod u+s ${D}${base_sbindir}/hciattach ${D}${base_sbindir}/hciconfig
 	install -m 0644 ${WORKDIR}/hcid.conf ${D}${sysconfdir}/bluetooth/
-	install -m 0755 ${WORKDIR}/02dtl1_cs.sh ${D}${sysconfdir}/apm/event.d/
 }
 
 CONFFILES_${PN} = "${sysconfdir}/bluetooth/hcid.conf ${sysconfdir}/bluetooth/rfcomm.conf \
diff --git a/packages/glib-2.0/glib-2.0_2.12.12.bb b/packages/glib-2.0/glib-2.0_2.12.12.bb
index f8eb9e5537..974081afce 100644
--- a/packages/glib-2.0/glib-2.0_2.12.12.bb
+++ b/packages/glib-2.0/glib-2.0_2.12.12.bb
@@ -1,6 +1,6 @@
 require glib.inc
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.12/glib-${PV}.tar.bz2 \
            file://glibconfig-sysdefs.h \
diff --git a/packages/glib-2.0/glib.inc b/packages/glib-2.0/glib.inc
index 6b384ad6c7..57f4af4cc4 100644
--- a/packages/glib-2.0/glib.inc
+++ b/packages/glib-2.0/glib.inc
@@ -8,12 +8,13 @@ SECTION = "libs"
 PRIORITY = "optional"
 DEPENDS += "glib-2.0-native gtk-doc"
 DEPENDS += "virtual/libiconv virtual/libintl"
-PACKAGES =+ "glib-2.0-utils "
+PACKAGES =+ "${PN}-dev glib-2.0-utils "
 
 PR = "r1"
 
 LEAD_SONAME = "libglib-2.0.*"
 FILES_glib-2.0-utils = "${bindir}/*"
+FILES_${PN}-dev += "${libdir}/glib-2.0 ${datadir}/glib-2.0"
 
 EXTRA_OECONF = "--disable-debug "
 
diff --git a/packages/gpephone/xoo-vm_0.7-20070204.bb b/packages/gpephone/xoo-vm_0.7-20070204.bb
index b927269db2..0bdda47359 100644
--- a/packages/gpephone/xoo-vm_0.7-20070204.bb
+++ b/packages/gpephone/xoo-vm_0.7-20070204.bb
@@ -6,7 +6,7 @@ LICENSE = "GPL"
 DEPENDS = "virtual/libx11 libxtst gtk+ libglade"
 SRCDATE = 20070204
 PV = "0.7+svn${SRCDATE}"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=Xoo;proto=http \
            file://gpephone-vm.patch;patch=1;pnum=0"
@@ -14,3 +14,5 @@ SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=Xoo;proto=http \
 S = "${WORKDIR}/Xoo"
 
 inherit autotools
+
+FILES_${PN} += "${datadir}/xoo"
diff --git a/packages/gtkmm/gtkmm.inc b/packages/gtkmm/gtkmm.inc
index b99bf9b395..9dd1e43d54 100644
--- a/packages/gtkmm/gtkmm.inc
+++ b/packages/gtkmm/gtkmm.inc
@@ -3,8 +3,7 @@ HOMEPAGE = "http://www.gtkmm.org/"
 SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "LGPL"
-DEPENDS = "atk glibmm gtk+"
-PR = "r0"
+DEPENDS = "atk glibmm gtk+ cairomm"
 
 inherit gnome autotools pkgconfig flow-lossage
 
diff --git a/packages/libopie/libopie2.inc b/packages/libopie/libopie2.inc
index 17cc4be40d..a5a5cef0bd 100644
--- a/packages/libopie/libopie2.inc
+++ b/packages/libopie/libopie2.inc
@@ -71,29 +71,29 @@ do_stage() {
 }
 
 do_install() {
-	install -d ${D}${palmtopdir}/lib
+	install -d ${D}${libdir}
 	for f in ${LIBS}
 	do
-		oe_libinstall -so libopie$f ${D}${palmtopdir}/lib
+		oe_libinstall -so libopie$f ${D}${libdir}
 	done
 }
 
 PACKAGES_prepend = " libopiecore2 libopiedb2 libopiesecurity2 libopiemm2 libopienet2 libopiepim2 libopieui2 libopiebluez2 "
 
 DESCRIPTION_libopiecore2 = "Opie Development Platform 1.x Core Library"
-FILES_libopiecore2 = "${palmtopdir}/lib/libopiecore2.so.*"
+FILES_libopiecore2 = "${libdir}/libopiecore2.so.*"
 DESCRIPTION_libopiedb2 = "Opie Development Platform 1.x Database Library"
-FILES_libopiedb2 = "${palmtopdir}/lib/libopiedb2.so.*"
+FILES_libopiedb2 = "${libdir}/libopiedb2.so.*"
 DESCRIPTION_libopiemm2 = "Opie Development Platform 1.x Multimedia Library"
-FILES_libopiemm2 = "${palmtopdir}/lib/libopiemm2.so.*"
+FILES_libopiemm2 = "${libdir}/libopiemm2.so.*"
 DESCRIPTION_libopienet2 = "Opie Development Platform 1.x Network Library"
-FILES_libopienet2 = "${palmtopdir}/lib/libopienet2.so.*"
+FILES_libopienet2 = "${libdir}/libopienet2.so.*"
 DESCRIPTION_libopiepim2 = "Opie Development Platform 1.x PIM Library"
-FILES_libopiepim2 = "${palmtopdir}/lib/libopiepim2.so.*"
+FILES_libopiepim2 = "${libdir}/libopiepim2.so.*"
 DESCRIPTION_libopieui2 = "Opie Development Platform 1.x User Interface Library"
-FILES_libopieui2 = "${palmtopdir}/lib/libopieui2.so.*"
+FILES_libopieui2 = "${libdir}/libopieui2.so.*"
 DESCRIPTION_libopiesecurity2 = "Opie Development Platform 1.x Security Library"
-FILES_libopiesecurity2 = "${palmtopdir}/lib/libopiesecurity2.so.*"
+FILES_libopiesecurity2 = "${libdir}/libopiesecurity2.so.*"
 DESCRIPTION_libopiebluez2 = "Opie Development Platform 1.x Bluetooth Library"
-FILES_libopiebluez2 = "${palmtopdir}/lib/libopiebluez2.so.*"
+FILES_libopiebluez2 = "${libdir}/libopiebluez2.so.*"
 
diff --git a/packages/libopie/libopie2_cvs.bb b/packages/libopie/libopie2_cvs.bb
index a832ee85f8..2e5772cd81 100644
--- a/packages/libopie/libopie2_cvs.bb
+++ b/packages/libopie/libopie2_cvs.bb
@@ -1,7 +1,7 @@
 require ${PN}.inc
 
 PV = "1.2.2+cvs${SRCDATE}"
-PR = "r9"
+PR = "r10"
 
 DEFAULT_PREFERENCE = "-1"
 
diff --git a/packages/libopietooth/libopietooth1.inc b/packages/libopietooth/libopietooth1.inc
index 4b81f26cab..2ceae495c3 100644
--- a/packages/libopietooth/libopietooth1.inc
+++ b/packages/libopietooth/libopietooth1.inc
@@ -16,6 +16,6 @@ do_stage() {
 }
 
 do_install() {
-    oe_libinstall -so libopietooth1 ${D}${palmtopdir}/lib
+    oe_libinstall -so libopietooth1 ${D}${libdir}
 }
 
diff --git a/packages/libopietooth/libopietooth1_cvs.bb b/packages/libopietooth/libopietooth1_cvs.bb
index db2d069a96..d58832315e 100644
--- a/packages/libopietooth/libopietooth1_cvs.bb
+++ b/packages/libopietooth/libopietooth1_cvs.bb
@@ -1,4 +1,5 @@
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/opietooth/lib"
 PV = "${OPIE_CVS_PV}"
+PR = "r1"
 
 require libopietooth1.inc
diff --git a/packages/libqpe/libqpe-opie.inc b/packages/libqpe/libqpe-opie.inc
index 292a29f7bd..2218734fea 100644
--- a/packages/libqpe/libqpe-opie.inc
+++ b/packages/libqpe/libqpe-opie.inc
@@ -16,14 +16,6 @@ EXTRA_QMAKEVARS_PRE += "CONFIG+=LIBQPE_WITHROHFEEDBACK"
 EXTRA_QMAKEVARS_POST += "DESTDIR= DEFINES+=LIBQPE_NO_INLINE_IMAGES"
 
 CXXFLAGS_append = " -DOPIE_NO_ERASE_RECT_HACKFIX -DOPIE_NEW_MALLOC"
-#CXXFLAGS_append_c7x0 =  " -DOPIE_NO_WINDOWED "
-#CXXFLAGS_append_tosa =  " -DOPIE_NO_WINDOWED "
-#CXXFLAGS_append_spitz = " -DOPIE_NO_WINDOWED "
-#CXXFLAGS_append_akita = " -DOPIE_NO_WINDOWED "
-
-do_compile_prepend_mnci () {
-	ln -s custom-ramses.h custom.h
-}
 
 do_compile() {
         mkdir -p ${STAGING_INCDIR}/qpe \
@@ -53,9 +45,9 @@ do_stage() {
 }
 
 do_install() {
-	oe_libinstall -so libqpe ${D}${palmtopdi