tslib: fix cvs build, reorder metadata for -maemo variant

diff --git a/packages/tslib/tslib-maemo_0.0.1-15.bb b/packages/tslib/tslib-maemo_0.0.1-15.bb
index f744833..e303b40 100644 (file)
--- 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_20060703.bb b/packages/tslib/tslib_20060703.bb
index 89296c4..f4ff493 100644 (file)
--- a/packages/tslib/tslib_20060703.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.1+cvs+${PV}"
+RV := "${PV}"
+PV = "0.1+cvs-${RV}"
 PR = "r0"
 
-SRC_URI = "cvs://cvs:@pubcvs.arm.linux.org.uk/mnt/src/cvsroot;module=tslib;date=${PV} \
+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 \