Convert packages CVSDATE -> SRCDATE and standardise some PV fields

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@268 311d38ba-8fff-0310-9ca6-ca027cbcb966

75 files changed, 91 insertions, 211 deletions

diff --git a/openembedded/packages/alsa/alsa-utils_1.0.10.bb b/openembedded/packages/alsa/alsa-utils_1.0.10.bb
index 916afedd16..94e49ebf25 100644
--- a/openembedded/packages/alsa/alsa-utils_1.0.10.bb
+++ b/openembedded/packages/alsa/alsa-utils_1.0.10.bb
@@ -52,6 +52,4 @@ DESCRIPTION_alsa-utils-alsaconf     = "a bash script that creates ALSA configura
 RDEPENDS_alsa-utils-aplay  += "alsa-conf"
 RDEPENDS_alsa-utils-amixer += "alsa-conf"
 
-# ALSA can be in kernel
-RRECOMMENDS_alsa-utils += "${ALSA_PACKAGES}"
 ALLOW_EMPTY_alsa-utils = "1"
diff --git a/openembedded/packages/apmd/apmd-3.2.2/apmwrapper b/openembedded/packages/apmd/apmd-3.2.2/apmwrapper
deleted file mode 100644
index 3bc9bece3d..0000000000
--- a/openembedded/packages/apmd/apmd-3.2.2/apmwrapper
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-if ( cat /proc/cpuinfo|grep -i hardware|grep -i SHARP ) && \
-   [ ".$@" = ".-s" -o ".$@" = ".--suspend" ]; then
-	killall -USR1 apmd || /usr/bin/apm.orig -s
-else
-	/usr/bin/apm.orig "$@"
-fi
-
diff --git a/openembedded/packages/apmd/apmd-3.2.2/devfs.patch b/openembedded/packages/apmd/apmd-3.2.2/devfs.patch
deleted file mode 100644
index b11e01929b..0000000000
--- a/openembedded/packages/apmd/apmd-3.2.2/devfs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- apmd-3.2.0.orig/apm.h~devfs
-+++ apmd-3.2.0.orig/apm.h
-@@ -24,7 +24,7 @@
- #include <sys/types.h>
- 
- #define APM_PROC   "/proc/apm"
--#define APM_DEVICE "/dev/apm_bios"
-+#define APM_DEVICE "/dev/misc/apm_bios"
- 
- #define APM_DEV  "/proc/devices"
- #define APM_NAME "apm_bios"
diff --git a/openembedded/packages/apmd/apmd-3.2.2/hwclock b/openembedded/packages/apmd/apmd-3.2.2/hwclock
deleted file mode 100644
index a1c1c2294c..0000000000
--- a/openembedded/packages/apmd/apmd-3.2.2/hwclock
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-# Preserve the system clock around suspend/resume.
-
-INIT="/etc/init.d/hwclock.sh"
-[ -x "${INIT}" ] || exit 0
-
-case "${1},${2}" in
-(suspend,*)
-    "${INIT}" stop
-    ;;
-(resume,suspend)
-    "${INIT}" start
-    ;;
-esac
-
-exit 0
diff --git a/openembedded/packages/apmd/apmd-3.2.2/logcheck.ignore.paranoid b/openembedded/packages/apmd/apmd-3.2.2/logcheck.ignore.paranoid
deleted file mode 100644
index de37f01a2d..0000000000
--- a/openembedded/packages/apmd/apmd-3.2.2/logcheck.ignore.paranoid
+++ /dev/null
@@ -1,13 +0,0 @@
-apmd\[[0-9]+\]: (Normal|Standby|Critical) Resume
-apmd\[[0-9]+\]: (Now using|Using) (AC|battery|backup) power
-apmd\[[0-9]+\]: (System|User) (Standby|Suspend)
-apmd\[[0-9]+\]: (apmd_)?call_proxy:
-apmd\[[0-9]+\]: Battery: [0-9]+%,
-apmd\[[0-9]+\]: Battery: absent
-apmd\[[0-9]+\]: Capability Change
-apmd\[[0-9]+\]: Exiting
-apmd\[[0-9]+\]: Performing APM status check
-apmd\[[0-9]+\]: Suspending now
-apmd\[[0-9]+\]: Update Time
-apmd\[[0-9]+\]: Version: apmd [0-9.]+, (apm )?driver [0-9.]+, APM BIOS [0-9.]+
-apmd\[[0-9]+\]: apmd [0-9.]+ interfacing with apm driver [0-9.]+ and APM BIOS [0-9.]+
diff --git a/openembedded/packages/apmd/apmd_3.2.2.bb b/openembedded/packages/apmd/apmd_3.2.2.bb
index 0e8b364458..4a23f39590 100644
--- a/openembedded/packages/apmd/apmd_3.2.2.bb
+++ b/openembedded/packages/apmd/apmd_3.2.2.bb
@@ -3,12 +3,12 @@ SECTION = "base"
 PRIORITY = "required"
 DEPENDS = "libtool-cross"
 LICENSE = "GPL"
-PR = "r5"
+PR = "r7"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/a/apmd/apmd_${PV}.orig.tar.gz; \
            file://debian.patch;patch=1 \
            file://workaround.patch;patch=1 \
-           file://apmwrapper \
+           file://zaurus24.patch;patch=1 \
            file://init \
            file://default \
            file://apmd_proxy \
@@ -44,25 +44,8 @@ do_install() {
 	install -d ${D}${bindir}
 	install -d ${D}${libdir}
 	install -d ${D}${datadir}/apmd
-#
-# only Zaurus 2.4-embedix kernels need a breadead apm hack
-#
-#
-	case ${MACHINE} in
-		collie | poodle | tosa | c7x0 | akita | spitz | borzoi)
-			if [ "${KERNEL_VERSION}" == "2.6" ]
-			then
-				install -m 4577 ${S}/.libs/apm ${D}${bindir}/apm
-			else
-				install -m 4755 ${S}/.libs/apm ${D}${bindir}/apm.orig
-				install -m 0755 ${WORKDIR}/apmwrapper ${D}${bindir}/apm
-			fi
-			;;
-        *)
-			install -m 4577 ${S}/.libs/apm ${D}${bindir}/apm
-        	;;
-    esac
 
+	install -m 4755 ${S}/.libs/apm ${D}${bindir}/apm
 	install -m 0755 ${S}/.libs/apmd ${D}${sbindir}/apmd
 	install -m 0755 ${WORKDIR}/apmd_proxy ${D}${sysconfdir}/apm/
 	install -m 0644 ${WORKDIR}/apmd_proxy.conf ${D}${datadir}/apmd/
@@ -79,5 +62,3 @@ PACKAGES =+ "libapm libapm-dev apm"
 FILES_libapm = "${libdir}/libapm.so.*"
 FILES_libapm-dev = "${libdir}/libapm.* ${includedir}"
 FILES_apm = "${bindir}/apm*"
-
-
diff --git a/openembedded/packages/binutils/binutils_cvs.bb b/openembedded/packages/binutils/binutils_cvs.bb
index f295795554..e870c8f0b5 100644
--- a/openembedded/packages/binutils/binutils_cvs.bb
+++ b/openembedded/packages/binutils/binutils_cvs.bb
@@ -6,7 +6,7 @@ HOMEPAGE = "http://www.gnu.org/software/binutils/"
 LICENSE = "GPL"
 MAINTAINER = "Gerald Britton <gbritton@doomcom.org>"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-cvs"
-PV = "0.0cvs${CVSDATE}"
+PV = "0.0+cvs${SRCDATE}"
 PR = "r2"
 
 PACKAGES = "${PN} ${PN}-dev ${PN}-doc ${PN}-symlinks"
diff --git a/openembedded/packages/compositeext/compositeext_cvs.bb b/openembedded/packages/compositeext/compositeext_cvs.bb
index 4b01bcfef0..75317fabcd 100644
--- a/openembedded/packages/compositeext/compositeext_cvs.bb
+++ b/openembedded/packages/compositeext/compositeext_cvs.bb
@@ -1,4 +1,4 @@
-PV = "0.0cvs${CVSDATE}"
+PV = "0.0+cvs${SRCDATE}"
 LICENSE= "BSD-X"
 SECTION = "libs"
 MAINTAINER = "Greg Gilbert <greg@treke.net>"
diff --git a/openembedded/packages/contacts/contacts_svn.bb b/openembedded/packages/contacts/contacts_svn.bb
index 2783a48b97..cd4f6a7836 100755
--- a/openembedded/packages/contacts/contacts_svn.bb
+++ b/openembedded/packages/contacts/contacts_svn.bb
@@ -7,7 +7,7 @@ MAINTAINER = "Chris Lord <chris@openedhand.com>"
 DESCRIPTION = "Contacts is an address-book application."
 PR = "r5"
 
-PV = "0.1+svn-${CVSDATE}"
+PV = "0.1+svn${SRCDATE}"
 
 SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http \
 	   file://stock_contact.png \
diff --git a/openembedded/packages/damageext/damageext_cvs.bb b/openembedded/packages/damageext/damageext_cvs.bb
index 6c68c457c8..1489e5355b 100644
--- a/openembedded/packages/damageext/damageext_cvs.bb
+++ b/openembedded/packages/damageext/damageext_cvs.bb
@@ -1,4 +1,4 @@
-PV = "0.0cvs${CVSDATE}"
+PV = "0.0+cvs${SRCDATE}"
 LICENSE = "MIT-X"
 SECTION = "libs"
 MAINTAINER = "Greg Gilbert <greg@treke.net>"
diff --git a/openembedded/packages/dates/dates_svn.bb b/openembedded/packages/dates/dates_svn.bb
index 4f8e0ce695..22c821b98b 100755
--- a/openembedded/packages/dates/dates_svn.bb
+++ b/openembedded/packages/dates/dates_svn.bb
@@ -6,7 +6,7 @@ DESCRIPTION = "Dates is a calendar application."
 
 PR = "r4"
 
-PV = "0.0cvs${CVSDATE}"
+PV = "0.0+svn${SRCDATE}"
 S = "${WORKDIR}/${PN}"
 
 SRC_URI = "svn://svn.o-hand.com/repos/;module=${PN};proto=http"
diff --git a/openembedded/packages/eds/eds-dbus_svn.bb b/openembedded/packages/eds/eds-dbus_svn.bb
index eff020d816..98658a1fae 100755
--- a/openembedded/packages/eds/eds-dbus_svn.bb
+++ b/openembedded/packages/eds/eds-dbus_svn.bb
@@ -3,7 +3,7 @@ DEPENDS = "glib-2.0 gtk+ gconf dbus db gnome-common libglade libiconv"
 RDEPENDS = "gconf dbus-1 db libiconv"
 MAINTAINER = "Chris Lord <chris@openedhand.com>"
 DESCRIPTION = "Evolution database backend server"
-PV = "1.4.0cvs${CVSDATE}"
+PV = "1.4.0+svn${SRCDATE}"
 PR = "r15"
 
 SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http \
diff --git a/openembedded/packages/fixesext/fixesext_cvs.bb b/openembedded/packages/fixesext/fixesext_cvs.bb
index 887ae2a138..c279256fa2 100644
--- a/openembedded/packages/fixesext/fixesext_cvs.bb
+++ b/openembedded/packages/fixesext/fixesext_cvs.bb
@@ -1,4 +1,4 @@
-PV = "0.0cvs${CVSDATE}"
+PV = "0.0+cvs${SRCDATE}"
 LICENSE= "BSD-X"
 SECTION = "libs"
 MAINTAINER = "Greg Gilbert <greg@treke.net>"
diff --git a/openembedded/packages/glibc/glibc_2.3.5+cvs20050627.bb b/openembedded/packages/glibc/glibc_2.3.5+cvs20050627.bb
index 5ee5583fc8..e7adcd0a39 100644
--- a/openembedded/packages/glibc/glibc_2.3.5+cvs20050627.bb
+++ b/openembedded/packages/glibc/glibc_2.3.5+cvs20050627.bb
@@ -6,7 +6,7 @@ PRIORITY = "required"
 MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs-2.3.5"
-CVSDATE = "20050627"
+SRCDATE = "20050627"
 PR = "r1"
 
 GLIBC_ADDONS ?= "ports,linuxthreads"
diff --git a/openembedded/packages/glibc/glibc_cvs.bb b/openembedded/packages/glibc/glibc_cvs.bb
index 99dd80b7ef..0390b87535 100644
--- a/openembedded/packages/glibc/glibc_cvs.bb
+++ b/openembedded/packages/glibc/glibc_cvs.bb
@@ -7,7 +7,7 @@ MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs-2.3.5"
 PR = "r0"
-PV = "2.3.5+cvs${CVSDATE}"
+PV = "2.3.5+cvs${SRCDATE}"
 
 GLIBC_ADDONS ?= "ports,linuxthreads"
 GLIBC_EXTRA_OECONF ?= ""
diff --git a/openembedded/packages/gnome/gconf-dbus_cvs.bb b/openembedded/packages/gnome/gconf-dbus_cvs.bb
index 13241bdc21..f8be0c4eee 100755
--- a/openembedded/packages/gnome/gconf-dbus_cvs.bb
+++ b/openembedded/packages/gnome/gconf-dbus_cvs.bb
@@ -7,7 +7,7 @@ PROVIDES = "gconf"
 RPROVIDES_${PN} = "gconf"
 RPROVIDES_${PN}-dev = "gconf-dev"
 
-PV = "0.0+cvs${CVSDATE}"
+PV = "0.0+cvs${SRCDATE}"
 PR = "r8"
 
 SRC_URI = "cvs://anonymous@anoncvs.gnome.org/cvs/gnome;module=gconf;tag=gconf-dbus-2-6 \
diff --git a/openembedded/packages/gnome/gconf-dbus_svn.bb b/openembedded/packages/gnome/gconf-dbus_svn.bb
index bf9b46224f..b71d5179cb 100644
--- a/openembedded/packages/gnome/gconf-dbus_svn.bb
+++ b/openembedded/packages/gnome/gconf-dbus_svn.bb
@@ -7,7 +7,7 @@ PROVIDES = "gconf"
 RPROVIDES_${PN} = "gconf"
 RPROVIDES_${PN}-dev = "gconf-dev"
 
-PV = "0.0+svn${CVSDATE}"
+PV = "0.0+svn${SRCDATE}"
 PR = "r0"
 
 SRC_URI = "svn://developer.imendio.com/svn/gconf-dbus;module=trunk;proto=http \
diff --git a/openembedded/packages/gnome/gnome-vfs-dbus_cvs.bb b/openembedded/packages/gnome/gnome-vfs-dbus_cvs.bb
index dc5dfb188b..660271d1c0 100755
--- a/openembedded/packages/gnome/gnome-vfs-dbus_cvs.bb
+++ b/openembedded/packages/gnome/gnome-vfs-dbus_cvs.bb
@@ -8,7 +8,7 @@ RPROVIDES_${PN} = "gnome-vfs"
 RPROVIDES_${PN}-dev = "gnome-vfs-dev"
 RRECOMMENDS_${PN} = "gnome-vfs-plugin-file shared-mime-info"
 
-PV = "2.12.0cvs${CVSDATE}"
+PV = "2.12.0+cvs${SRCDATE}"
 PR = "r5"
 
 SRC_URI = "svn://anonymous@developer.imendio.com/svn/gnome-vfs-dbus;module=trunk;proto=http \
diff --git a/openembedded/packages/gnu-config/gnu-config_20050701.bb b/openembedded/packages/gnu-config/gnu-config_20050701.bb
index fd6615edbf..4bc4501ec8 100644
--- a/openembedded/packages/gnu-config/gnu-config_20050701.bb
+++ b/openembedded/packages/gnu-config/gnu-config_20050701.bb
@@ -5,11 +5,11 @@ DEPENDS = ""
 INHIBIT_DEFAULT_DEPS = "1"
 MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 
-FIXEDCVSDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}"
-PV = "0.1cvs${FIXEDCVSDATE}"
+FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}"
+PV = "0.1+cvs${FIXEDSRCDATE}"
 PR = "r4"
 
-SRC_URI = "cvs://anonymous@cvs.savannah.gnu.org/cvsroot/config;module=config;method=pserver;date=${FIXEDCVSDATE} \
+SRC_URI = "cvs://anonymous@cvs.savannah.gnu.org/cvsroot/config;module=config;method=pserver;date=${FIXEDSRCDATE} \
 	   file://config-guess-uclibc.patch;patch=1 \
            file://gnu-configize.in"
 S = "${WORKDIR}/config"
diff --git a/openembedded/packages/gtkhtml2/gtkhtml2_cvs.bb b/openembedded/packages/gtkhtml2/gtkhtml2_cvs.bb
index 8cc963dd22..5771567804 100755
--- a/openembedded/pack