merge of 206b62d33d8fadd9502205340feea3a4daeadab2

     and c1af7d38a30e0ddecb5419ddff4da1059d587a73

15 files changed, 46 insertions, 13 deletions

diff --git a/packages/automake/automake-native.inc b/packages/automake/automake-native.inc
index 9e89ac8621..7b69252ff0 100644
--- a/packages/automake/automake-native.inc
+++ b/packages/automake/automake-native.inc
@@ -1,7 +1,7 @@
 SECTION = "devel"
 include automake_${PV}.bb
 DEPENDS = "autoconf-native"
-RDEPENDS_${PN} = "autoconf-native perl-native-runtime"
+RDEPENDS_automake-native = "autoconf-native perl-native-runtime"
 
 inherit native
 
diff --git a/packages/automake/automake.inc b/packages/automake/automake.inc
new file mode 100644
index 0000000000..fa59c1f5cc
--- /dev/null
+++ b/packages/automake/automake.inc
@@ -0,0 +1,23 @@
+RDEPENDS_automake += "\
+    autoconf \
+    perl \
+    perl-module-bytes \
+    perl-module-constant \
+    perl-module-cwd \
+    perl-module-data-dumper \
+    perl-module-dynaloader \
+    perl-module-errno \
+    perl-module-exporter-heavy \
+    perl-module-file-basename \
+    perl-module-file-compare \
+    perl-module-file-copy \
+    perl-module-file-glob \
+    perl-module-file-spec-unix \
+    perl-module-file-stat \
+    perl-module-getopt-long \
+    perl-module-io \
+    perl-module-io-file \
+    perl-module-posix \
+    perl-module-strict \
+    perl-module-text-parsewords \
+    perl-module-vars "
diff --git a/packages/automake/automake_1.7.7.bb b/packages/automake/automake_1.7.7.bb
index 619361bcfd..7483868ee4 100644
--- a/packages/automake/automake_1.7.7.bb
+++ b/packages/automake/automake_1.7.7.bb
@@ -7,7 +7,8 @@ PR = "r7"
 inherit autotools
 
 FILES_${PN} += "${datadir}/automake* ${datadir}/aclocal*"
-RDEPENDS_${PN} += "autoconf-native perl-native"
+
+include automake.inc
 
 do_install () {
 	oe_runmake 'DESTDIR=${D}' install
diff --git a/packages/automake/automake_1.8.2.bb b/packages/automake/automake_1.8.2.bb
index cdcd1690e1..9921a8d6a4 100644
--- a/packages/automake/automake_1.8.2.bb
+++ b/packages/automake/automake_1.8.2.bb
@@ -11,7 +11,8 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/automake-${PV}"
 inherit autotools
 
 FILES_${PN} += "${datadir}/automake* ${datadir}/aclocal*"
-RDEPENDS_${PN} += "autoconf perl"
+
+include automake.inc
 
 do_install () {
 	oe_runmake 'DESTDIR=${D}' install
diff --git a/packages/automake/automake_1.8.4.bb b/packages/automake/automake_1.8.4.bb
index 56cf80a327..493d2cc907 100644
--- a/packages/automake/automake_1.8.4.bb
+++ b/packages/automake/automake_1.8.4.bb
@@ -11,7 +11,8 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/automake-${PV}"
 inherit autotools
 
 FILES_${PN} += "${datadir}/automake* ${datadir}/aclocal*"
-RDEPENDS_${PN} += "autoconf perl"
+
+include automake.inc
 
 do_install () {
 	oe_runmake 'DESTDIR=${D}' install
diff --git a/packages/automake/automake_1.9.2.bb b/packages/automake/automake_1.9.2.bb
index 0bf4288650..4027862768 100644
--- a/packages/automake/automake_1.9.2.bb
+++ b/packages/automake/automake_1.9.2.bb
@@ -12,7 +12,8 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/automake-${PV}"
 inherit autotools
 
 FILES_${PN} += "${datadir}/automake* ${datadir}/aclocal*"
-RDEPENDS_${PN} += "autoconf perl"
+
+include automake.inc
 
 do_install () {
 	oe_runmake 'DESTDIR=${D}' install
diff --git a/packages/automake/automake_1.9.3.bb b/packages/automake/automake_1.9.3.bb
index 71bf0bd58b..fb75b83b68 100644
--- a/packages/automake/automake_1.9.3.bb
+++ b/packages/automake/automake_1.9.3.bb
@@ -13,7 +13,8 @@ inherit autotools
 
 export AUTOMAKE = "${@bb.which('automake', bb.data.getVar('PATH', d, 1))}"
 FILES_${PN} += "${datadir}/automake* ${datadir}/aclocal*"
-RDEPENDS_${PN} += "autoconf perl"
+
+include automake.inc
 
 do_install () {
 	oe_runmake 'DESTDIR=${D}' install
diff --git a/packages/classpath/classpath.inc b/packages/classpath/classpath.inc
index cbbab0ad16..c2c9c1281b 100644
--- a/packages/classpath/classpath.inc
+++ b/packages/classpath/classpath.inc
@@ -2,6 +2,7 @@ DESCRIPTION = "GNU Classpath standard Java libraries"
 HOMEPAGE = "http://www.gnu.org/software/classpath/"
 LICENSE = "Classpath"
 PRIORITY = "optional"
+MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 SECTION = "libs"
 
 PBN = "classpath"
diff --git a/packages/jikes/jikes_1.22.bb b/packages/jikes/jikes_1.22.bb
index 3ed510a7f1..728b30087a 100644
--- a/packages/jikes/jikes_1.22.bb
+++ b/packages/jikes/jikes_1.22.bb
@@ -1,6 +1,7 @@
 DESCRIPTION = "Java compiler adhering to language and VM specifications"
 HOMEPAGE = "http://jikes.sourceforge.net/"
 PRIORITY = "optional"
+MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 SECTION = "devel"
 LICENSE = "IBM"
 PR = "r0"
diff --git a/packages/linux/mnci-ramses_2.4.21-rmk2-pxa1.bb b/packages/linux/mnci-ramses_2.4.21-rmk2-pxa1.bb
index 5e562798de..76e1769e31 100644
--- a/packages/linux/mnci-ramses_2.4.21-rmk2-pxa1.bb
+++ b/packages/linux/mnci-ramses_2.4.21-rmk2-pxa1.bb
@@ -58,7 +58,7 @@ pkg_postinst_kernel () {
 
 pkg_postinst_modules () {
 if [ -n "$D" ]; then
-	${HOST_PREFIX}depmod -A -b $D -F $D/boot/System.map-${PV} ${KERNEL_VERSION}
+	${HOST_PREFIX}depmod-${KERNEL_MAJOR_VERSION} -A -b $D -F $D/boot/System.map-${PV} ${KERNEL_VERSION}
 else
 	depmod -A
 fi
diff --git a/packages/module-init-tools/module-init-tools-cross_3.2.2.bb b/packages/module-init-tools/module-init-tools-cross_3.2.2.bb
index 4bcc311709..fc8b461945 100644
--- a/packages/module-init-tools/module-init-tools-cross_3.2.2.bb
+++ b/packages/module-init-tools/module-init-tools-cross_3.2.2.bb
@@ -8,6 +8,7 @@ EXTRA_OECONF_append = " --program-prefix=${TARGET_PREFIX}"
 
 do_stage () {
         oe_runmake install
+        mv ${bindir}/${TARGET_PREFIX}depmod ${bindir}/${TARGET_PREFIX}depmod-2.6
 }
 
 do_install () {
diff --git a/packages/module-init-tools/module-init-tools_3.2.2.bb b/packages/module-init-tools/module-init-tools_3.2.2.bb
index b0d2f34e5e..727bfaac1b 100644
--- a/packages/module-init-tools/module-init-tools_3.2.2.bb
+++ b/packages/module-init-tools/module-init-tools_3.2.2.bb
@@ -3,7 +3,7 @@ removing kernel modules for Linux (versions 2.5.48 and above). It serves \
 the same function that the modutils package serves for Linux 2.4."
 LICENSE = "GPL"
 SECTION = "base"
-PR = "r1"
+PR = "r2"
 
 PACKAGES =+ "module-init-tools-insmod-static module-init-tools-depmod"
 RDEPENDS_${PN} += "module-init-tools-depmod"
diff --git a/packages/modutils/modutils-cross_2.4.27.bb b/packages/modutils/modutils-cross_2.4.27.bb
index 2b301d7d09..9ecdfba5da 100644
--- a/packages/modutils/modutils-cross_2.4.27.bb
+++ b/packages/modutils/modutils-cross_2.4.27.bb
@@ -1,6 +1,6 @@
 SECTION = "base"
 include modutils_${PV}.bb
-PR = "r6"
+PR = "r7"
 inherit cross
 S = "${WORKDIR}/modutils-${PV}"
 DEPENDS = ""
@@ -19,6 +19,7 @@ CFLAGS_prepend_mipseb = "-D__MIPSEB__"
 
 do_stage () {
         oe_runmake install
+        mv ${bindir}/${TARGET_PREFIX}-depmod ${bindir}/${TARGET_PREFIX}-depmod-2.4
 }
 
 do_install () {
diff --git a/packages/modutils/modutils_2.4.27.bb b/packages/modutils/modutils_2.4.27.bb
index 9fa7cef105..56420f7de0 100644
--- a/packages/modutils/modutils_2.4.27.bb
+++ b/packages/modutils/modutils_2.4.27.bb
@@ -39,10 +39,10 @@ for f in sbin/insmod sbin/modprobe sbin/rmmod bin/lsmod; do
 done
 if test -n "$D"; then
 	D="-r $D"
-	if test -n "`which ${TARGET_PREFIX}depmod`"; then
+	if test -n "`which ${TARGET_PREFIX}depmod-2.4`"; then
 		for kerneldir in `ls -p ${IMAGE_ROOTFS}/lib/modules|grep /`; do
 			kernelver=`basename $kerneldir`
-			${TARGET_PREFIX}depmod -a -b ${IMAGE_ROOTFS} -C ${IMAGE_ROOTFS}/${sysconfdir}/modules.conf -r $kernelver
+			${TARGET_PREFIX}depmod-2.4 -a -b ${IMAGE_ROOTFS} -C ${IMAGE_ROOTFS}/${sysconfdir}/modules.conf -r $kernelver
 		done
 	fi
 fi
diff --git a/packages/mpfr/mpfr_2.1.1.bb b/packages/mpfr/mpfr_2.1.1.bb
index 8b739c0803..1bf29fb6b1 100644
--- a/packages/mpfr/mpfr_2.1.1.bb
+++ b/packages/mpfr/mpfr_2.1.1.bb
@@ -3,7 +3,7 @@ LICENSE = "LGPL"
 MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 SECTION = "libs"
 DEPENDS = "gmp"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://www.mpfr.org/mpfr-${PV}/mpfr-${PV}.tar.bz2"
 S = "${WORKDIR}/mpfr-${PV}"
@@ -15,5 +15,6 @@ do_stage() {
 	       bindir=${STAGING_BINDIR} \
 	       includedir=${STAGING_INCDIR} \
 	       libdir=${STAGING_LIBDIR} \
-	       datadir=${STAGING_DATADIR}
+	       datadir=${STAGING_DATADIR} \
+	       infodir=${STAGING_DIR}/${HOST_SYS}/info 
 }