5 files changed, 28 insertions, 19 deletions
diff --git a/packages/libcwd/libcwd_0.99.40.bb b/packages/libcwd/libcwd_0.99.44.bb
index a2650eec85..1288ea6e75 100644
--- a/packages/libcwd/libcwd_0.99.40.bb
+++ b/packages/libcwd/libcwd_0.99.44.bb
@@ -12,6 +12,10 @@ SRC_URI = "http://puzzle.dl.sourceforge.net/sourceforge/libcwd/libcwd-${PV}.tar.
 
 inherit autotools
 
+do_configure() {
+	oe_runconf
+}
+
 PARALLEL_MAKE = ""
 
 PACKAGES =+ "${PN}-config ${PN}-mt"
diff --git a/packages/tslib/tslib-maemo_0.0.1-15.bb b/packages/tslib/tslib-maemo_0.0.1-15.bb
index f744833d57..e303b40841 100644
--- a/packages/tslib/tslib-maemo_0.0.1-15.bb
+++ b/packages/tslib/tslib-maemo_0.0.1-15.bb
@@ -1,25 +1,18 @@
-DEFAULT_PREFERENCE = "-1"
-SECTION = "base"
 DESCRIPTION = "tslib is a touchscreen access library (maemo patched version)."
-PR = "r2"
+SECTION = "GPL"
+LICENSE = "LGPL"
 PROVIDES = "tslib"
+PR = "r3"
 
 DEFAULT_PREFERENCE = "-1"
 
-SRC_URI_OVERRIDES_PACKAGE_ARCH = "0"
-PACKAGE_ARCH_tslib-conf = "${MACHINE_ARCH}"
-
 SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/t/tslib/tslib_${PV}.tar.gz \
 	   file://ts.conf \
 	   file://tslib.sh"
-
 S = "${WORKDIR}/tslib"
-LICENSE = "LGPL"
-CONFFILES_${PN} = "${sysconfdir}/ts.conf"
 
 inherit autotools
 
-PACKAGES = "tslib-maemo-conf libts-maemo libts-maemo-dev tslib-maemo-tests tslib-maemo-calibrate"
 EXTRA_OECONF = "--enable-shared"
 
 do_stage () {
@@ -36,6 +29,11 @@ do_install_append() {
 	install -m 0755 ${WORKDIR}/tslib.sh ${D}${sysconfdir}/profile.d/
 }
 
+SRC_URI_OVERRIDES_PACKAGE_ARCH = "0"
+PACKAGE_ARCH_tslib-conf = "${MACHINE_ARCH}"
+CONFFILES_${PN} = "${sysconfdir}/ts.conf"
+PACKAGES = "tslib-maemo-conf libts-maemo libts-maemo-dev tslib-maemo-tests tslib-maemo-calibrate"
+
 RDEPENDS_libts-maemo = "tslib-maemo-conf"
 
 RPROVIDES_tslib-maemo-conf = "tslib-conf"
diff --git a/packages/tslib/tslib_cvs.bb b/packages/tslib/tslib_20060703.bb
index bd3478191e..f4ff493b57 100644
--- a/packages/tslib/tslib_cvs.bb
+++ b/packages/tslib/tslib_20060703.bb
@@ -4,10 +4,11 @@ AUTHOR = "Russell King w/ plugins by Chris Larson et. al."
 SECTION = "base"
 LICENSE = "LGPL"
 
-PV = "0.0+cvs${SRCDATE}"
-PR = "r39"
+RV := "${PV}"
+PV = "0.1+cvs-${RV}"
+PR = "r0"
 
-SRC_URI = "cvs://cvs:@pubcvs.arm.linux.org.uk/mnt/src/cvsroot;module=tslib \
+SRC_URI = "cvs://cvs:@pubcvs.arm.linux.org.uk/mnt/src/cvsroot;module=tslib;date=${RV} \
            file://usec_fix.patch;patch=1 \
            file://ts.conf \
            file://ts-2.6.conf \
diff --git a/packages/txdrug/txdrug_0.1.bb b/packages/txdrug/txdrug_0.1.bb
index 7e77fb2348..fd12180ac6 100644
--- a/packages/txdrug/txdrug_0.1.bb
+++ b/packages/txdrug/txdrug_0.1.bb
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 DEPENDS = "sqlite"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://teax.sourceforge.net/txdrug-${PV}.tar.gz \
            file://${FILESDIR}/${palmtopdir}"
@@ -12,6 +12,12 @@ S = "${WORKDIR}/txdrug-tar"
 
 inherit palmtop
 
+EXTRA_QMAKEVARS_POST += "LIBS+=-lsqlite TARGET=txdrug"
+
+do_configure_prepend() {
+	rm -f Makefile && qmake -project
+}
+
 do_install() {
         install -d ${D}${palmtopdir}
 	cp -dfr `ls -dp ${WORKDIR}/${palmtopdir}/*|grep -v SCCS` ${D}${palmtopdir}/
diff --git a/packages/zbedic/zbedic_1.0.bb b/packages/zbedic/zbedic_1.0.bb
index d7218a241d..4290258b61 100644
--- a/packages/zbedic/zbedic_1.0.bb
+++ b/packages/zbedic/zbedic_1.0.bb
@@ -6,7 +6,7 @@ LICENSE = "GPL"
 DEPENDS = "libbedic"
 APPTYPE = "binary"
 APPDESKTOP = "${WORKDIR}/misc"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/bedic/zbedic_${PV}-0.tgz \
            file://opie-icons.patch;patch=1 \
@@ -18,11 +18,11 @@ S = "${WORKDIR}"
 inherit opie
 export OE_QMAKE_LINK="${CXX}"
 
+EXTRA_QMAKEVARS_POST += "INCLUDEPATH+=${STAGING_INCDIR}/libbedic LIBS+=-lbedic LIBS+=-lsqlite3 TARGET=zbedic"
 
-do_configure() {
-	cd ${S} && rm -rf *~ && qmake -project && qmake -makefile -spec ${QMAKESPEC} -after \
-        INCLUDEPATH=${STAGING_INCDIR}/libbedic DEFINES+=QWS \
-	LIBS+=-lqpe LIBS+=-lbedic LIBS+=-lsqlite3 DESTDIR=${S} TARGET=zbedic
+do_configure_prepend() {
+	rm -f Makefile
+	qmake -project
 }
 
 do_install() {