merge of 38a9824230c1f33aa1b69405d1a6074d1df99753

     and d83e77353ac4cf240e630aa66aa54eb794547a60

35 files changed, 813 insertions, 91 deletions

diff --git a/packages/altboot/altboot.bb b/packages/altboot/altboot.bb
index a0b5996d6c..a322dacdd9 100644
--- a/packages/altboot/altboot.bb
+++ b/packages/altboot/altboot.bb
@@ -6,7 +6,7 @@ MAINTAINER = "Matthias 'CoreDump' Hentges  <oe@hentges.net>"
 LICENSE = "GPL"
  
 
-PR = "r7"
+PR = "r8"
 
 
 SRC_URI = "file://altboot-menu \
diff --git a/packages/altboot/files/akita/altboot.cfg b/packages/altboot/files/akita/altboot.cfg
index 254aac95a2..8361b28f2a 100644
--- a/packages/altboot/files/akita/altboot.cfg
+++ b/packages/altboot/files/akita/altboot.cfg
@@ -6,6 +6,7 @@ TIMEOUT="3"
 REAL_INIT="/sbin/init.sysvinit"
 SH_SHELL="/bin/sh"
 IMAGE_PATH="boot-images"
+IMAGE_TYPE="ext2"
 FSCK_IMAGES="yes"
 SD_DEVICE="/dev/mmcda1"
 SD_KERNEL_MODULE="/lib/modules/2.4.20/kernel/drivers/block/sharp_mmcsd_m.o"
diff --git a/packages/altboot/files/altboot.func b/packages/altboot/files/altboot.func
index 642587b630..0598c8ce93 100644
--- a/packages/altboot/files/altboot.func
+++ b/packages/altboot/files/altboot.func
@@ -151,8 +151,9 @@ pivot_image() {
 	if [ "$IMAGE_TYPE" = "" ]; then
 		IMAGE_TYPE="auto"
 	fi
-	mount -t $IMAGE_TYPE /dev/loop0 /media/image || die "mount /dev/loop0 /media/image failed!"
-
+	# If mount fails it has the tendency to spew out a _lot_ of error messages.
+	# We direct the output to /dev/null so the user can see which step actually failed.
+	mount -t $IMAGE_TYPE /dev/loop0 /media/image >/dev/null 2>&1 || die "mount -t $IMAGE_TYPE  /dev/loop0 /media/image failed!"
 
 	mkdir -p /media/image/media/ROM || die "mkdir -p /media/image/media/ROM failed"
 
diff --git a/packages/altboot/files/collie/altboot.cfg b/packages/altboot/files/collie/altboot.cfg
index 5b979e7ae4..9d2560f76b 100644
--- a/packages/altboot/files/collie/altboot.cfg
+++ b/packages/altboot/files/collie/altboot.cfg
@@ -7,6 +7,7 @@ TIMEOUT="3"
 REAL_INIT="/sbin/init.sysvinit"
 SH_SHELL="/bin/sh"
 IMAGE_PATH="boot-images"
+IMAGE_TYPE="ext2"
 FSCK_IMAGES="no"
 SD_DEVICE="/dev/mmcda1"
 SD_KERNEL_MODULE="/lib/modules/2.4.18-rmk7-pxa3-embedix/kernel/drivers/block/sharp_mmcsd_m.o"
diff --git a/packages/altboot/files/poodle/altboot.cfg b/packages/altboot/files/poodle/altboot.cfg
index 5b979e7ae4..9d2560f76b 100644
--- a/packages/altboot/files/poodle/altboot.cfg
+++ b/packages/altboot/files/poodle/altboot.cfg
@@ -7,6 +7,7 @@ TIMEOUT="3"
 REAL_INIT="/sbin/init.sysvinit"
 SH_SHELL="/bin/sh"
 IMAGE_PATH="boot-images"
+IMAGE_TYPE="ext2"
 FSCK_IMAGES="no"
 SD_DEVICE="/dev/mmcda1"
 SD_KERNEL_MODULE="/lib/modules/2.4.18-rmk7-pxa3-embedix/kernel/drivers/block/sharp_mmcsd_m.o"
diff --git a/packages/gstreamer/files/.mtn2git_empty b/packages/gnet/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/gstreamer/files/.mtn2git_empty
+++ b/packages/gnet/.mtn2git_empty
diff --git a/packages/gnet/gnet_2.0.7.bb b/packages/gnet/gnet_2.0.7.bb
new file mode 100644
index 0000000000..d5e93c4000
--- /dev/null
+++ b/packages/gnet/gnet_2.0.7.bb
@@ -0,0 +1,10 @@
+DESCRIPTION =	"GNet is a simple network library. It is written in C, object-oriented, and built upon GLib."
+LICENSE =	"LGPL"
+HOMEPAGE =	"http://www.gnetlibrary.org/"
+
+SRC_URI =	"http://www.gnetlibrary.org/src/gnet-2.0.7.tar.gz"
+DEPENDS =	"glib-2.0"
+
+EXTRA_OECONF =	"--disable-pthreads"
+
+inherit pkgconfig autotools		
diff --git a/packages/gstreamer/gst-plugins-0.8.8/.mtn2git_empty b/packages/gstreamer/gst-plugins-0.8.8/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gstreamer/gst-plugins-0.8.8/.mtn2git_empty
diff --git a/packages/gstreamer/gst-plugins-0.8.8/gst-plugins-0.8.8-try-esdsink.patch b/packages/gstreamer/gst-plugins-0.8.8/gst-plugins-0.8.8-try-esdsink.patch
new file mode 100644
index 0000000000..553c7b4270
--- /dev/null
+++ b/packages/gstreamer/gst-plugins-0.8.8/gst-plugins-0.8.8-try-esdsink.patch
@@ -0,0 +1,19 @@
+--- gst-plugins-0.8.8.orig/gst-libs/gst/gconf/gconf.c	2005-02-02 09:14:01.000000000 +0100
++++ gst-plugins-0.8.8/gst-libs/gst/gconf/gconf.c	2005-08-13 23:28:36.000000000 +0200
+@@ -205,9 +205,13 @@
+   if (!ret) {
+     ret = gst_element_factory_make (DEFAULT_AUDIOSINK, NULL);
+ 
+-    if (!ret)
+-      g_warning ("No GConf default audio sink key and %s doesn't work",
+-          DEFAULT_AUDIOSINK);
++    if (!ret) {
++      ret = gst_element_factory_make ("esdsink", NULL);
++
++      if (!ret)
++        g_warning ("No GConf default audio sink key and neither %s nor esdsink work",
++            DEFAULT_AUDIOSINK);
++    }
+   }
+ 
+   return ret;
diff --git a/packages/gstreamer/gst-plugins-0.8.8/lame-autoconf.patch b/packages/gstreamer/gst-plugins-0.8.8/lame-autoconf.patch
new file mode 100644
index 0000000000..6f2a300254
--- /dev/null
+++ b/packages/gstreamer/gst-plugins-0.8.8/lame-autoconf.patch
@@ -0,0 +1,11 @@
+--- gst-plugins-0.8.7/configure.ac.orig	2005-03-03 16:40:45.000000000 +0100
++++ gst-plugins-0.8.7/configure.ac	2005-03-03 16:41:55.000000000 +0100
+@@ -1197,7 +1197,7 @@
+     LAME_LIBS="-lmp3lame -lm"
+     dnl is lame presets available
+     LAME_CFLAGS=""
+-    AC_TRY_RUN([
++    AC_TRY_COMPILE([
+ #include <lame/lame.h>
+ int main (int argc, char *argv[])
+ {
diff --git a/packages/gstreamer/files/lame-autoconf.patch b/packages/gstreamer/gst-plugins/lame-autoconf.patch
index 3fb85e7d88..3fb85e7d88 100644
--- a/packages/gstreamer/files/lame-autoconf.patch
+++ b/packages/gstreamer/gst-plugins/lame-autoconf.patch
diff --git a/packages/gstreamer/files/try-esdsink.patch b/packages/gstreamer/gst-plugins/try-esdsink.patch
index 9c6242663c..9c6242663c 100644
--- a/packages/gstreamer/files/try-esdsink.patch
+++ b/packages/gstreamer/gst-plugins/try-esdsink.patch
diff --git a/packages/gstreamer/gst-plugins_0.8.8.bb b/packages/gstreamer/gst-plugins_0.8.8.bb
new file mode 100644
index 0000000000..6b28922f27
--- /dev/null
+++ b/packages/gstreamer/gst-plugins_0.8.8.bb
@@ -0,0 +1,57 @@
+LICENSE = "GPL"
+DESCRIPTION = "Plugins for GStreamer"
+SECTION = "x11/libs"
+PRIORITY = "optional"
+MAINTAINER = "Phil Blundell <pb@handhelds.org>"
+PR = "r0"
+
+DEPENDS = "gstreamer libmikmod libmad libogg tremor libvorbis libid3tag gpe-soundserver gconf"
+
+SRC_URI = "http://gstreamer.freedesktop.org/src/gst-plugins/gst-plugins-${PV}.tar.bz2 \
+	   file://gst-plugins-0.8.7-httpsrc1.patch;patch=1 \
+	   file://lame-autoconf.patch;patch=1 \
+	   file://gst-plugins-0.8.8-try-esdsink.patch;patch=1"
+
+EXTRA_OECONF = "--disable-docs-build --disable-dependency-tracking --disable-aalib --disable-arts \
+                --disable-artsc --disable-jack  --disable-libfame --disable-sdl --disable-shout2 \
+		--disable-gnome_vfs --disable-gconf --disable-libcaca  --disable-directfb \
+		--disable-cairo"
+
+inherit autotools pkgconfig gconf
+
+acpaths = "-I ${S}/common/m4 -I ${S}/m4"
+
+LIBV = "0.8"
+
+plugin_postinst() {
+	if [ x"$D" = "x" ]; then
+		gst-register --gst-registry=/var/cache/gstreamer-0.8/registry.xml
+	fi
+}
+
+python populate_packages_prepend () {
+	gst_libdir = bb.data.expand('${libdir}/gstreamer-${LIBV}', d)
+	postinst = bb.data.getVar('plugin_postinst', d, 1)
+
+	do_split_packages(d, gst_libdir, '^libgst(.*)\.so$', 'gst-plugin-%s', 'GStreamer plugin for %s', postinst=postinst)
+	do_split_packages(d, gst_libdir, '^libgst(.*)\.l?a$', 'gst-plugin-%s-dev', 'GStreamer plugin for %s (development files)')
+}
+
+do_stage() {
+	autotools_stage_includes
+	while read a b; do
+		oe_libinstall -C gst-libs/gst/$a -so libgst$b ${STAGING_LIBDIR}
+	done <<EOF
+. interfaces-0.8
+audio audio
+audio audiofilter
+gconf gconf-0.8
+idct idct
+media-info media-info-0.8
+play play-0.8
+resample resample
+riff riff
+video video
+xwindowlistener xwindowlistener
+EOF
+}
diff --git a/packages/gstreamer/gstreamer-0.8.10/.mtn2git_empty b/packages/gstreamer/gstreamer-0.8.10/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gstreamer/gstreamer-0.8.10/.mtn2git_empty
diff --git a/packages/gstreamer/gstreamer-0.8.10/filesrc-uri.patch b/packages/gstreamer/gstreamer-0.8.10/filesrc-uri.patch
new file mode 100644
index 0000000000..0bde73d970
--- /dev/null
+++ b/packages/gstreamer/gstreamer-0.8.10/filesrc-uri.patch
@@ -0,0 +1,22 @@
+Index: gst/elements/gstfilesrc.c
+===================================================================
+RCS file: /cvs/gstreamer/gstreamer/gst/elements/gstfilesrc.c,v
+retrieving revision 1.108.4.3
+diff -u -r1.108.4.3 gstfilesrc.c
+--- gstreamer.orig/gst/elements/gstfilesrc.c	3 Jun 2005 09:29:31 -0000	1.108.4.3
++++ gstreamer/gst/elements/gstfilesrc.c	12 Aug 2005 11:54:38 -0000
+@@ -306,7 +306,13 @@
+     src->filename = NULL;
+     src->uri = NULL;
+   } else {
+-    src->filename = g_strdup (location);
++    const gchar *file_prefix = "file://";
++
++    if (g_str_has_prefix (location, file_prefix)) {
++      src->filename = g_strdup (location + strlen (file_prefix));
++    } else {
++      src->filename = g_strdup (location);
++    }
+     src->uri = gst_uri_construct ("file", src->filename);
+   }
+   g_object_notify (G_OBJECT (src), "location");
diff --git a/packages/gstreamer/files/no-libxml2.patch b/packages/gstreamer/gstreamer-0.8.9/no-libxml2.patch
index c676c2387f..c676c2387f 100644
--- a/packages/gstreamer/files/no-libxml2.patch
+++ b/packages/gstreamer/gstreamer-0.8.9/no-libxml2.patch
diff --git a/packages/gstreamer/gstreamer_0.8.10.bb b/packages/gstreamer/gstreamer_0.8.10.bb
new file mode 100644
index 0000000000..7247bd831a
--- /dev/null
+++ b/packages/gstreamer/gstreamer_0.8.10.bb
@@ -0,0 +1,34 @@
+LICENSE = "LGPL"
+PR = "r0"
+
+DESCRIPTION = "GStreamer is a multimedia framework for encoding and decoding video and sound. \
+It supports a wide range of formats including mp3, ogg, avi, mpeg and quicktime."
+DEPENDS = "glib-2.0 gettext-native popt"
+SECTION = "base"
+PRIORITY = "optional"
+
+FILES_${PN} += " ${libdir}/gstreamer-0.8/*.so"
+FILES_${PN}-dev += " ${libdir}/gstreamer-0.8/*.la ${libdir}/gstreamer-0.8/*.a"
+
+SRC_URI = "http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.bz2 \
+	file://filesrc-uri.patch;patch=1 \
+	file://gstreamer.xsession"
+
+EXTRA_OECONF = "--disable-docs-build --disable-dependency-tracking --disable-loadsave"
+
+inherit autotools pkgconfig
+
+do_stage() {
+	oe_runmake install prefix=${STAGING_DIR} \
+	       bindir=${STAGING_BINDIR} \
+	       includedir=${STAGING_INCDIR} \
+	       libdir=${STAGING_LIBDIR} \
+	       datadir=${STAGING_DATADIR} \
+	       mandir=${STAGING_DIR}/share/man
+}
+
+do_install_append() {
+	install -d ${D}${sysconfdir}/X11/Xsession.d
+	install ${WORKDIR}/gstreamer.xsession ${D}${sysconfdir}/X11/Xsession.d/90gst-register
+}
+
diff --git a/packages/linux/linux-openzaurus-2.6.13-rc5-mm1/defconfig-spitz b/packages/linux/linux-openzaurus-2.6.13-rc5-mm1/defconfig-spitz
index 02437440c5..ce1f55b0f9 100644
--- a/packages/linux/linux-openzaurus-2.6.13-rc5-mm1/defconfig-spitz
+++ b/packages/linux/linux-openzaurus-2.6.13-rc5-mm1/defconfig-spitz
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.13-rc5-mm1
-# Fri Aug 12 08:40:57 2005
+# Sat Aug 13 23:17:29 2005
 #
 CONFIG_ARM=y
 CONFIG_MMU=y
@@ -160,7 +160,7 @@ CONFIG_ALIGNMENT_TRAP=y
 #
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_CMDLINE="console=ttyS0,115200n8 console=tty1 noinitrd root=/dev/mtdblock2 rootfstype=jffs2 debug "
+CONFIG_CMDLINE="console=ttyS0,115200n8 console=tty1 noinitrd root=/dev/mtdblock2 rootfstype=jffs2   debug"
 # CONFIG_XIP_KERNEL is not set
 
 #
@@ -714,7 +714,7 @@ CONFIG_BACKLIGHT_CLASS_DEVICE=y
 CONFIG_BACKLIGHT_DEVICE=y
 CONFIG_LCD_CLASS_DEVICE=y
 CONFIG_LCD_DEVICE=y
-# CONFIG_BACKLIGHT_CORGI is not set
+CONFIG_BACKLIGHT_CORGI=y
 
 #
 # Speakup console speech
diff --git a/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb b/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb
index fd6dd9ee37..bcc2c13c28 100644
--- a/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb
+++ b/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 #KV = "${@bb.data.getVar('PV',d,True).split('-')[0]}"
 KV = "${@bb.data.getVar('PV',d,True)}"
 
-PR = "r3"
+PR = "r4"
 
 DOSRC = "http://www.do13.in-berlin.de/openzaurus/patches"
 RPSRC = "http://www.rpsys.net/openzaurus/patches"
@@ -79,10 +79,10 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.12.tar.gz \
            ${DOSRC}/tosa-2.6.13-r1.patch;patch=1 \
            ${RPSRC}/temp/tosa-bl-r5.patch;patch=1 \
            ${RPSRC}/pxa27x_extraregs-r0.patch;patch=1 \
-           ${RPSRC}/spitzbase-r0.patch;patch=1 \
+           ${RPSRC}/spitzbase-r1.patch;patch=1 \
            ${RPSRC}/spitzkbd-r0.patch;patch=1 \
-           ${RPSRC}/spitzssp-r0.patch;patch=1 \
-           ${RPSRC}/spitzlcd-r0.patch;patch=1 \
+           ${RPSRC}/spitzssp-r1.patch;patch=1 \
+           ${RPSRC}/spitzbl-r0.patch;patch=1 \
            file://add-oz-release-string.patch;patch=1 \
            file://add-elpp-stuff.patch;patch=1 \
            file://pxa-serial-hack.patch;patch=1 \
@@ -110,7 +110,7 @@ SRC_URI_append_tosa = "${DOSRC}/nand-readid-r1.patch;patch=1 \
                        ${DOSRC}/tosa-pxaac97-r1.patch;patch=1 \
         	       ${DOSRC}/tosa-bluetooth-r0.patch;patch=1 "
 SRC_URI_append_spitz = "${RPSRC}/spitzcf-r0.patch;patch=1 \
-                        ${RPSRC}/spitzts-r0.patch;patch=1 "
+                        ${RPSRC}/spitzts-r1.patch;patch=1 "
 
 S = "${WORKDIR}/linux-2.6.12"
 
diff --git a/packages/meta/meta-e-x11.bb b/packages/meta/meta-e-x11.bb
index 8c2729dabe..f539dac95a 100644
--- a/packages/meta/meta-e-x11.bb
+++ b/packages/meta/meta-e-x11.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Meta-package for Enlightenment/X11"
 LICENSE = "MIT"
 PACKAGES = "task-enlightenment-x11"
-PR = "r1"
+PR = "r2"
 
 FEED_URIS += "x11##http://openzaurus.org/official/unstable/3.5.2/feed/x11 \
               e##http://openzaurus.org/official/unstable/3.5.2/feed/e"
@@ -11,7 +11,8 @@ ALLOW_EMPTY = 1
 #
 # X
 #
-DEPENDS  += "diet-x11 rxvt-unicode xstroke xtscal xrandr xmodmap xdpyinfo fontconfig ttf-bitstream-vera"
+DEPENDS  += "diet-x11 rxvt-unicode xstroke xtscal xrandr xmodmap xdpyinfo fontconfig \
+	     ttf-bitstream-vera bash"
 RDEPENDS += "         rxvt-unicode xstroke xtscal xrandr xmodmap xdpyinfo            ttf-bitstream-vera"
 
 #
diff --git a/packages/meta/openslug-packages.bb b/packages/meta/openslug-packages.bb
index db150f7972..3cc03058c0 100644
--- a/packages/meta/openslug-packages.bb
+++ b/packages/meta/openslug-packages.bb
@@ -44,6 +44,7 @@ OPENSLUG_PACKAGES = "\
 	gzip \
 	iperf \
 	ipkg-utils \
+	joe \
 	jpeg \
 	less \
 	libpam \
diff --git a/packages/opie-i18n/opie-lrelease-native.inc b/packages/opie-i18n/opie-lrelease-native.inc
new file mode 100644
index 0000000000..16d983693b
--- /dev/null
+++ b/packages/opie-i18n/opie-lrelease-native.inc
@@ -0,0 +1,17 @@
+DESCRIPTION = "Opie native i18n tool lrelease"
+SECTION = "opie/base"
+PRIORITY = "optional"
+MAINTAINER = "Holger Freyther <zecke@handhelds.org>"
+LICENSE = "GPL"
+DEPENDS = "uicmoc3-native"
+
+S = "${WORKDIR}/opie-lrelease"
+
+inherit native qmake qt3e
+
+export OE_QMAKE_LINK="${CXX}"
+EXTRA_QMAKEVARS_POST_append = "LIBS+=-ldl"
+
+do_stage() {
+	install -m 0755 opie-lrelease ${STAGING_BINDIR}/
+}
diff --git a/packages/opie-i18n/opie-lrelease-native_1.2.0.bb b/packages/opie-i18n/opie-lrelease-native_1.2.0.bb
index 17a662d957..699a72256c 100644
--- a/packages/opie-i18n/opie-lrelease-native_1.2.0.bb
+++ b/packages/opie-i18n/opie-lrelease-native_1.2.0.bb
@@ -1,21 +1,5 @@
-DESCRIPTION = "Opie native i18n tool lrelease"
-SECTION = "opie/base"
-PRIORITY = "optional"
-MAINTAINER = "Holger Freyther <zecke@handhelds.org>"
-LICENSE = "GPL"
-DEPENDS = "uicmoc3-native"
+include ${PN}.inc
 
 TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/development/translation/opie-lrelease \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/development/translation/shared"
-
-S = "${WORKDIR}/opie-lrelease"
-
-inherit native qmake
-
-export OE_QMAKE_LINK="${CXX}"
-EXTRA_QMAKEVARS_POST_append = "LIBS+=-ldl"
-
-do_stage() {
-	install -m 0755 opie-lrelease ${STAGING_BINDIR}/
-}
diff --git a/packages/opie-i18n/opie-lrelease-native_cvs.bb b/packages/opie-i18n/opie-lrelease-native_cvs.bb
index 637746bdf3..e6809cc9da 100644
--- a/packages/opie-i18n/opie-lrelease-native_cvs.bb
+++ b/packages/opie-i18n/opie-lrelease-native_cvs.bb
@@ -1,21 +1,5 @@
-DESCRIPTION = "Opie native i18n tool lrelease"
-SECTION = "opie/base"
-PRIORITY = "optional"
-MAINTAINER = "Holger Freyther <zecke@handhelds.org>"
-LICENSE = "GPL"
-DEPENDS = "uicmoc3-native"
-PV = "1.2.0+cvs-${CVSDATE}"
+include ${PN}.inc
 
+PV = "1.2.0+cvs-${CVSDATE}"
 SRC_URI = "${HANDHELDS_CVS};module=opie/development/translation/opie-lrelease \
            ${HANDHELDS_CVS};module=opie/development/translation/shared"
-
-S = "${WORKDIR}/opie-lrelease"
-
-inherit native qmake
-
-export OE_QMAKE_LINK="${CXX}"
-EXTRA_QMAKEVARS_POST_append = "LIBS+=-ldl"
-
-do_stage() {
-	install -m 0755 opie-lrelease ${STAGING_BINDIR}/
-}
diff --git a/packages/opie-i18n/opie-lupdate-native.inc b/packages/opie-i18n/opie-lupdate-native.inc
new file mode 100644
index 0000000000..98eb30a864
--- /dev/null
+++ b/packages/opie-i18n/opie-lupdate-native.inc
@@ -0,0 +1,18 @@
+DESCRIPTION = "Opie native i18n tool lupdate"
+SECTION = "opie/base"
+PRIORITY = "optional"
+MAINTAINER = "Holger Freyther <zecke@handhelds.org>"
+LICENSE = "GPL"
+DEPENDS = "uicmoc3-native"
+
+S = "${WORKDIR}/opie-lupdate"
+
+inherit native qmake qt3e
+
+export OE_QMAKE_LINK="${CXX}"
+EXTRA_QMAKEVARS_POST_append = "LIBS+=-ldl "
+EXTRA_QMAKEVARS_POST_append = "CONFIG-=thread "
+
+do_stage() {
+	install -m 0755 opie-lupdate ${STAGING_BINDIR}/
+}
diff --git a/packages/opie-i18n/opie-lupdate-native_1.2.0.bb b/packages/opie-i18n/opie-lupdate-native_1.2.0.bb
index 29076a4bd7..d4e7f18284 100644
--- a/packages/opie-i18n/opie-lupdate-native_1.2.0.bb
+++ b/packages/opie-i18n/opie-lupdate-native_1.2.0.bb
@@ -1,22 +1,6 @@
-DESCRIPTION = "Opie native i18n tool lupdate"
-SECTION = "opie/base"
-PRIORITY = "optional"
-MAINTAINER = "Holger Freyther <zecke@handhelds.org>"
-LICENSE = "GPL"
-DEPENDS = "uicmoc3-native"
+include ${PN}.inc
 
 TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/development/translation/opie-lupdate \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/development/translation/shared"
 
-S = "${WORKDIR}/opie-lupdate"
-
-inherit native qmake
-
-export OE_QMAKE_LINK="${CXX}"
-EXTRA_QMAKEVARS_POST_append = "LIBS+=-ldl "
-EXTRA_QMAKEVARS_POST_append = "CONFIG-=thread "
-
-do_stage() {
-	install -m 0755 opie-lupdate ${STAGING_BINDIR}/
-}
diff --git a/packages/opie-i18n/opie-lupdate-native_cvs.bb b/packages/opie-i18n/opie-lupdate-native_cvs.bb
index acc15176d0..57fba3893e 100644
--- a/packages/opie-i18n/opie-lupdate-native_cvs.bb
+++ b/packages/opie-i18n/opie-lupdate-native_cvs.bb
@@ -1,22 +1,5 @@
-DESCRIPTION = "Opie native i18n tool lupdate"
-SECTION = "opie/base"
-PRIORITY = "optional"
-MAINTAINER = "Holger Freyther <zecke@handhelds.org>"
-LICENSE = "GPL"
-DEPENDS = "uicmoc3-native"
-PV = "1.2.0+cvs-${CVSDATE}"
+include ${PN}.inc
 
+PV      = "1.2.0+cvs-${CVSDATE}"
 SRC_URI = "${HANDHELDS_CVS};module=opie/development/translation/opie-lupdate \
            ${HANDHELDS_CVS};module=opie/development/translation/shared"
-
-S = "${WORKDIR}/opie-lupdate"
-
-inherit native qmake
-
-export OE_QMAKE_LINK="${CXX}"
-EXTRA_QMAKEVARS_POST_append = "LIBS+=-ldl "
-EXTRA_QMAKEVARS_POST_append = "CONFIG-=thread "
-
-do_stage() {
-	install -m 0755 opie-lupdate ${STAGING_BINDIR}/
-}
diff --git a/packages/ssmtp/ssmtp_2.61.bb b/packages/ssmtp/ssmtp_2.61.bb
index ddf7d13d19..71a2ef7786 100644
--- a/packages/ssmtp/ssmtp_2.61.bb
+++ b/packages/ssmtp/ssmtp_2.61.bb
@@ -2,7 +2,7 @@ SECTION = "console/network"
 
 DEPENDS = "openssl"
 DESCRIPTION = "Extremely simple MTA to get mail off the system to a mail hub."
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/s/ssmtp/ssmtp_${PV}.orig.tar.gz \
            file://ldflags.patch;patch=1 \
@@ -11,7 +11,7 @@ SRC_URI = "${DEBIAN_MIRROR}/main/s/ssmtp/ssmtp_${PV}.orig.tar.gz \
            file://ssmtp.conf"
 S = "${WORKDIR}/${PN}-2.61"
 LICENSE = "GPL"
-CONFFILE = "${sysconfdir}/ssmtp/ssmtp.conf"
+#CONFFILES = "${sysconfdir}/ssmtp/ssmtp.conf ${sysconfdir}/ssmtp/revaliases"
 inherit autotools
 
 EXTRA_OECONF = "--enable-ssl"
@@ -28,7 +28,7 @@ do_install () {
 }
 
 pkg_postinst () {
-	update-alternatives --install ${sbindir}/sendmail sendmail ${bindir}/ssmtp 90
+	update-alternatives --install ${sbindir}/sendmail sendmail ${bindir}/ssmtp 30
 }
 
 pkg_postrm () {
diff --git a/packages/uclibc/uclibc-0.9.27/thumb-interwork-asm.patch b/packages/uclibc/uclibc-0.9.27/thumb-interwork-asm.patch
new file mode 100644
index 0000000000..bc99f9a5db
--- /dev/null
+++ b/packages/uclibc/uclibc-0.9.27/thumb-interwork-asm.patch
@@ -0,0 +1,326 @@
+--- uClibc-0.9.27/ldso/include/dl-elf.h	2005-01-11 23:59:21.000000000 -0800
++++ uClibc-0.9.27/ldso/include/dl-elf.h	2005-08-12 18:24:43.000000000 -0700
+@@ -112,6 +112,13 @@
+ # define ELF_RTYPE_CLASS_COPY	(0x2)
+ #endif
+ #define ELF_RTYPE_CLASS_PLT	(0x1)
++/* The type class can be qualified by a list (mask) of the acceptable
++ * STT_ symbol types, if not given the default is everything numerically
++ * <= STT_FUNC (from the original code...)
++ */
++#define ELF_RTYPE_CLASS_OF(type) ((1<<2) << (type))
++#define ELF_RTYPE_CLASS_ALL      (0xffff << 2)
++#define ELF_RTYPE_CLASS_DEFAULT  (((ELF_RTYPE_CLASS_OF(STT_FUNC) << 1) - 1)&ELF_RTYPE_CLASS_ALL)
+ 
+ 
+ /* Convert between the Linux flags for page protections and the
+--- uClibc-0.9.27/ldso/ldso/arm/resolve.S	2005-01-11 23:59:21.000000000 -0800
++++ uClibc-0.9.27/ldso/ldso/arm/resolve.S	2005-08-13 15:08:27.523344709 -0700
+@@ -1,43 +1,117 @@
+ /*
+- * This function is _not_ called directly.  It is jumped to (so no return
+- * address is on the stack) when attempting to use a symbol that has not yet
+- * been resolved.  The first time a jump symbol (such as a function call inside
+- * a shared library) is used (before it gets resolved) it will jump here to
+- * _dl_linux_resolve.  When we get called the stack looks like this:
+- *	reloc_entry
+- *	tpnt
+- *
+- * This function saves all the registers, puts a copy of reloc_entry and tpnt
+- * on the stack (as function arguments) then make the function call
+- * _dl_linux_resolver(tpnt, reloc_entry).  _dl_linux_resolver() figures out
+- * where the jump symbol is _really_ supposed to have jumped to and returns
+- * that to us.  Once we have that, we overwrite tpnt with this fixed up
+- * address. We then clean up after ourselves, put all the registers back how we
+- * found them, then we jump to the fixed up address, which is where the jump
+- * symbol that got us here really wanted to jump to in the first place.
+- *  -Erik Andersen
++ * On ARM the PLT contains the following three instructions (for ARM calls):
++ *
++ *	add   ip, pc, #0xNN00000
++ *	add   ip, ip, #0xNN000
++ *	ldr   pc, [ip, #0xNNN]!
++ *
++ * So that, effectively, causes the following to happen:
++ *
++ *	ip := pc+0x0NNNNNNN
++ *	pc := *ip
++ *
++ * For thumb the above fragment is preceded by "bx pc, nop" to switch to ARM
++ * mode and the thumb 'bl' must go to PLT-4 - the PLT entry is expanded by
++ * four bytes to accomodate the trampoline code.
++ *
++ * 0x0NNNNNNN is the offset of the GOT entry for this function relative to
++ * the PLT entry for this function (where the code is).  So the code in the
++ * PLT causes a branch to whatever is in the GOT, leaving the actual address
++ * of the GOT entry in ip.  (Note that the GOT must follow the PLT - the
++ * added value is 28 bit unsigned).
++ *
++ * ip is a pointer to the GOT entry for this function, the first time round
++ * *ip points to this code:
++ *
++ *	str   lr, [sp, #-4]!	@ save lr
++ *	ldr   lr, [pc, #4]	@ lr := *dat (&GOT_TABLE[0]-.)