propagate from branch 'org.openembedded.dev' (head 90fd17f3fbfc8174e5d80133eab8cd54f5d4ae54)

            to branch 'org.openembedded.nslu2-linux' (head cd3e906a30a7bdfaa5b587b2444f3621499b8f84)

12 files changed, 75 insertions, 17 deletions

diff --git a/packages/altboot/altboot_20050620.bb b/packages/altboot/altboot_20050727.bb
index f2635e0f6a..f2635e0f6a 100644
--- a/packages/altboot/altboot_20050620.bb
+++ b/packages/altboot/altboot_20050727.bb
diff --git a/packages/altboot/files/akita/.mtn2git_empty b/packages/altboot/files/akita/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/altboot/files/akita/.mtn2git_empty
diff --git a/packages/altboot/files/akita/altboot.cfg b/packages/altboot/files/akita/altboot.cfg
new file mode 100644
index 0000000000..254aac95a2
--- /dev/null
+++ b/packages/altboot/files/akita/altboot.cfg
@@ -0,0 +1,18 @@
+# Handled by /sbin/init.altboot
+# Allow booting images from SD or CF instead of booting
+# the ROM. 
+ENABLE_ALTBOOT="yes"
+TIMEOUT="3"
+REAL_INIT="/sbin/init.sysvinit"
+SH_SHELL="/bin/sh"
+IMAGE_PATH="boot-images"
+FSCK_IMAGES="yes"
+SD_DEVICE="/dev/mmcda1"
+SD_KERNEL_MODULE="/lib/modules/2.4.20/kernel/drivers/block/sharp_mmcsd_m.o"
+INIT_RUNLEVEL="5"
+NO_GUI_RL="2"
+MASTER_PASSWORD=""
+ASK_PW_ON_BOOT="no"
+
+SD_MOUNTPOINT="/media/card"
+CF_MOUNTPOINT="/media/cf"
diff --git a/packages/gkrellm/gkrellm_2.2.1.bb b/packages/gkrellm/gkrellm_2.2.7.bb
index 2e668e7a87..01f68482ef 100644
--- a/packages/gkrellm/gkrellm_2.2.1.bb
+++ b/packages/gkrellm/gkrellm_2.2.7.bb
@@ -3,10 +3,8 @@ DESCRIPTION = "GKrellM is a GTK-based stacked monitor program."
 MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 LICENSE = "GPL"
 DEPENDS = "gtk+ glib-2.0 libsm ice"
-PR = "r1"
 
-SRC_URI = "http://web.wt.net/~billw/gkrellm/gkrellm-${PV}.tar.bz2"
-S = "${WORKDIR}/gkrellm-${PV}"
+SRC_URI = "http://members.dslextreme.com/users/billw/gkrellm/gkrellm-${PV}.tar.bz2"
 
 inherit pkgconfig
 
diff --git a/packages/gpe-helpviewer/gpe-helpviewer_1.0.bb b/packages/gpe-helpviewer/gpe-helpviewer_1.0.bb
index e7fff8fc66..eb9c9ba910 100644
--- a/packages/gpe-helpviewer/gpe-helpviewer_1.0.bb
+++ b/packages/gpe-helpviewer/gpe-helpviewer_1.0.bb
@@ -1,19 +1,59 @@
-PR = "r1"
+PR = "r2"
 
-SRC_URI = "http://stag.mind.be/gpe-helpviewer.tar.bz2"
+DESCRIPTION = "A helpviewer based on gtk+webcore"
+LICENSE = "GPL"
+
+SRC_URI = "http://stag.mind.be/gpe-helpviewer-${PV}.tar.bz2"
+
+DEPENDS = "osb-nrcit"
+RDEPENDS = "gpe-helpviewer-doc"
 
-DEPENDS = "gtkhtml-3.0 gpe-helpviewer-${PN}-doc"
 
 S = "${WORKDIR}/gpe-helpviewer"
 
 inherit autotools
 
 do_install() {
-		install -d ${D}${docdir}/gpe-helpviewer
-		install -m 0644 ${S}/gpe-helpviewer.html  ${D}${docdir}/gpe-helpviewer
+		install -d ${D}${docdir}/gpe
+		install -m 0644 ${S}/gpe-helpviewer.html  ${D}${docdir}/gpe/
 		install -d ${D}/usr/share/applications
 		install -m 0644 ${S}/gpe-helpviewer.desktop ${D}/usr/share/applications/gpe-helpviewer.desktop
 		install -d ${D}/usr/share/pixmaps
 		install -m 0644 ${S}/gpe-help.png ${D}/usr/share/pixmaps/gpe-help.png
 		autotools_do_install
 }
+
+pkg_postinst_${PN}-doc () {
+        #!/bin/sh
+	if [ "x$D" != "x" ]; then
+        if [ -e /etc/gpe/gpe-help.conf ]; then
+                echo gpe-helpviewer = /usr/share/doc/gpe/gpe-helpviewer.html >> /etc/gpe/gpe-help.conf
+        else
+                 echo [Help] >> /etc/gpe/gpe-help.conf
+                 echo gpe-helpviewer = /usr/share/doc/gpe/gpe-helpviewer.html >> /etc/gpe/gpe-help.conf
+        fi
+        if [ -x /usr/bin/gpe-helpindex ]; then
+                echo generating help-index
+                gpe-helpindex
+        else
+                echo not generating index for gpe-helpviewer
+        fi
+	fi
+}
+
+pkg_postrm_${PN}-doc () {
+        #!/bin/sh
+	if [ "x$D" != "x" ]; then
+        if [ -e /etc/gpe/gpe-help.conf ]; then
+                sed '/^\<gpe-helpviewer\>/d' /etc/gpe/gpe-help.conf > /tmp/gpe-help.conf
+                mv /tmp/gpe-help.conf /etc/gpe/gpe-help.conf
+        fi
+        if [ -x /usr/bin/gpe-helpindex ]; then
+                echo generating help-index
+                gpe-helpindex
+        else
+                echo not generating index for gpe-helpviewer
+        fi
+	fi
+}
+
diff --git a/packages/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050228.bb b/packages/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050228.bb
index 1bf70a62d6..a3363d824f 100644
--- a/packages/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050228.bb
+++ b/packages/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050228.bb
@@ -5,7 +5,7 @@ SECTION = "kernel"
 PV = "2.4.20-rmk2-embedix"
 LICENSE = "GPL"
 KV = "2.4.20"
-PR = "r9"
+PR = "r10"
 
 SRC_URI = "http://developer.ezaurus.com/sl_j/source/c1000/20050228/linux-c1000-20050228-rom1_01.tar.bz2 \
            file://P01-C3000-clockup_050221.patch;pnum=2;patch=1 \
@@ -56,7 +56,7 @@ inherit kernel
 CMDLINE_MTDPARTS_spitz   = "mtdparts=sharpsl-nand:7168k@0k(smf),5120k@7168k(root),-(home)  EQUIPMENT=0"
 CMDLINE_MTDPARTS_akita   = "mtdparts=sharpsl-nand:7168k@0k(smf),54272k@7168k(root),-(home) EQUIPMENT=4"
 
-CMDLINE_ROOT = "root=/dev/mtdblock2 jffs2 jffs2_orphaned_inodes=delete LOGOLANG=1 DEFYEAR=2006 LOGO=1 LAUNCH=q"
+CMDLINE_ROOT = "root=/dev/mtdblock2 jffs2_orphaned_inodes=delete LOGOLANG=1 DEFYEAR=2006 LOGO=1 LAUNCH=q"
 # CMDLINE_INIT = "init=/bin/busybox ash"
 CMDLINE_INIT = " "
 CMDLINE = "${CMDLINE_MTDPARTS} ${CMDLINE_ROOT} ${CMDLINE_CONSOLE} ${CMDLINE_INIT}"
diff --git a/packages/lmbench/lmbench_2.0.4.bb b/packages/lmbench/lmbench_2.0.4.bb
index dfe8c82d13..e7bdb46c3a 100644
--- a/packages/lmbench/lmbench_2.0.4.bb
+++ b/packages/lmbench/lmbench_2.0.4.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "Tools for performance analysis."
 LICENSE = "GPL"
 MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 
-SRC_URI = "ftp://ftp.bitmover.com/lmbench/lmbench-${PV}.tgz \
+SRC_URI = "${SOURCEFORGE_MIRROR}/lmbench/lmbench-${PV}.tgz \
 	   file://debian.patch;patch=1 \
 	   file://exe.patch;patch=1 \
 	   file://lmbench-run"
diff --git a/packages/misc-binary-only/tda1004x-firmware.bb b/packages/misc-binary-only/tda1004x-firmware.bb
index bce3bac29f..77e936fa9b 100644
--- a/packages/misc-binary-only/tda1004x-firmware.bb
+++ b/packages/misc-binary-only/tda1004x-firmware.bb
@@ -1,7 +1,7 @@
 SECTION = "base"
 DEPENDS = "unzip-native"
 
-SRC_URI = "http://hauppauge.lightpath.net/de/nova-pci216.exe"
+SRC_URI = "http://hauppauge.lightpath.net/de/nova-pci218c.exe"
 FILES_${PN} = '*'
 
 python do_unpack() {
diff --git a/packages/prboom/files/prboom.sh b/packages/prboom/files/prboom.sh
index fac024b211..7e41d87fcb 100755
--- a/packages/prboom/files/prboom.sh
+++ b/packages/prboom/files/prboom.sh
@@ -4,6 +4,7 @@ model="`cat /proc/cpuinfo | sed -n "/Hardware/s/.*\:\ \(.*\)/\1/p"`"
 
 case $model in
 *Collie)	par="-height 240";;
+*Poodle)	par="-height 240";;
 *00)		par="-height 240";;
 *)		par="";;
 esac
diff --git a/packages/prboom/prboom-opie_2.2.6.bb b/packages/prboom/prboom-opie_2.2.6.bb
index c0df03c5a6..1ab4227619 100644
--- a/packages/prboom/prboom-opie_2.2.6.bb
+++ b/packages/prboom/prboom-opie_2.2.6.bb
@@ -1,6 +1,6 @@
 include prboom_${PV}.bb
 
-PR = "r4"
+PR = "r5"
 
 S = "${WORKDIR}/prboom-${PV}"
 
diff --git a/packages/putty/putty_cvs.bb b/packages/putty/putty_svn.bb
index a82649712a..e36b79dc30 100644
--- a/packages/putty/putty_cvs.bb
+++ b/packages/putty/putty_svn.bb
@@ -1,14 +1,15 @@
 DESCRIPTION = "PuTTY is a free implementation of Telnet and SSH for Win32 and Unix platforms"
 SECTION = "console/network"
+LICENSE = "MIT"
+PV = "0.58+cvs-${CVSDATE}"
 
-SRC_URI = "cvs://cvsuser:anonymous@cvs.tartarus.org/home/cvs;module=putty \
+SRC_URI = "svn://ixion.tartarus.org/main;module=putty \
 	   file://lib.pro \
 	   file://plink.pro \
 	   file://pscp.pro \
 	   file://psftp.pro"
-LICENSE = "MIT"
+
 TARGETS = "lib plink pscp psftp"
-PV = "0.54-cvs-${CVSDATE}"
 
 S = "${WORKDIR}/putty"
 
diff --git a/packages/sparse/sparse_snapshot.bb b/packages/sparse/sparse_snapshot.bb
index 03a2d9a451..d3a522b1b7 100644
--- a/packages/sparse/sparse_snapshot.bb
+++ b/packages/sparse/sparse_snapshot.bb
@@ -15,7 +15,7 @@ preprocessor (although it contains as a part of it a preprocessing phase)."
 MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 PV = "0.0${CVSDATE}"
 LICENSE = "OSL"
-SRC_URI = "http://www.codemonkey.org.uk/projects/bitkeeper/sparse/sparse-${@get_snapshot_date(d)}.tar.gz \
+SRC_URI = "http://www.codemonkey.org.uk/projects/git-snapshots/sparse/sparse-${@get_snapshot_date(d)}.tar.gz \
 	   file://compile.patch;patch=1 \
 	   file://vars.patch;patch=1"
 S = "${WORKDIR}/sparse-bk"