merge of 5e29a13bc14135c916ea8402999a2ff0c201523d

     and b461cf906dbd45594408dde96a32eebad44f2416

55 files changed, 1160 insertions, 75 deletions

diff --git a/conf/distro/angstrom-2006.9.conf b/conf/distro/angstrom-2006.9.conf
index 9c1208c690..86f3eaa1fb 100644
--- a/conf/distro/angstrom-2006.9.conf
+++ b/conf/distro/angstrom-2006.9.conf
@@ -23,7 +23,7 @@ FEED_URIS += " \
 #        updates##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/updates"
 
 SRCDATE = "20060518"
-#SRCDATE_handhelds-pxa-2.6 = "20060516"
+SRCDATE_handhelds-pxa-2.6 = "20060622"
 
 CVS_TARBALL_STASH = "\
 http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/3.5.4/sources/ \
diff --git a/conf/distro/generic-unstable.conf b/conf/distro/generic-unstable.conf
new file mode 100644
index 0000000000..e1805c0d0f
--- /dev/null
+++ b/conf/distro/generic-unstable.conf
@@ -0,0 +1,28 @@
+#@--------------------------------------------------------------------
+#@TYPE: Distribution
+#@NAME: Bleeding Edge
+#@DESCRIPTION: An experimental distribution configuration
+#@--------------------------------------------------------------------
+
+require conf/distro/generic.conf
+
+#
+# Binutils & Compiler
+#
+PREFERRED_VERSION_gcc = "4.1.1"
+PREFERRED_VERSION_gcc-cross = "4.1.1"
+PREFERRED_VERSION_gcc-cross-initial = "4.1.1"
+PREFERRED_VERSION_binutils = "2.16.91.0.7"
+PREFERRED_VERSION_binutils-cross = "2.16.91.0.7"
+PREFERRED_VERSION_linux-libc-headers = "2.6.15.99"
+
+#
+# Target OS, FPU system and libc
+#
+TARGET_OS = "linux"
+TARGET_FPU = "soft"
+PREFERRED_PROVIDER_virtual/libiconv = "glibc"
+PREFERRED_PROVIDER_virtual/libintl = "glibc"
+PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate"
+PREFERRED_VERSION_glibc = "2.4"
+PREFERRED_VERSION_glibc-intermediate = "2.4"
diff --git a/conf/distro/jlime-donkey.conf b/conf/distro/jlime-donkey.conf
index f7da451e65..8a9d427c9f 100644
--- a/conf/distro/jlime-donkey.conf
+++ b/conf/distro/jlime-donkey.conf
@@ -68,9 +68,9 @@ TARGET_OS = "linux"
 #<>What we want on the bootstrap image (extra) 
 #<>                                            
 #<>
-BOOTSTRAP_EXTRA_RDEPENDS += "pcmciautils ncurses nano wireless-tools console-tools coreutils udev kernel-modules \
+BOOTSTRAP_EXTRA_RDEPENDS += "pcmciautils ncurses nano wireless-tools console-tools coreutils udev \
                              e2tools e2fsprogs"
-BOOTSTRAP_EXTRA_DEPENDS  += "pcmciautils ncurses nano wireless-tools console-tools coreutils udev kernel-modules \
+BOOTSTRAP_EXTRA_DEPENDS  += "pcmciautils ncurses nano wireless-tools console-tools coreutils udev \
                              e2tools e2fsprogs"
 
 #<>
diff --git a/conf/machine/htcuniversal.conf b/conf/machine/htcuniversal.conf
index 800cd77540..288f3ebaa9 100644
--- a/conf/machine/htcuniversal.conf
+++ b/conf/machine/htcuniversal.conf
@@ -15,7 +15,7 @@ BOOTSTRAP_EXTRA_RRECOMMENDS += "${@linux_module_packages('${PXA270_MODULES}', d)
 BOOTSTRAP_EXTRA_RDEPENDS_append = " module-init-tools detect-stylus"
 BOOTSTRAP_EXTRA_RDEPENDS_append = " tiinit acx-firmware"
 
-PXA270_MODULES = "g_ether snd_pcm_oss snd_mixer_oss hidp"
+PXA270_MODULES = "g_ether g_serial snd_pcm_oss snd_mixer_oss hidp i2c-core i2c-pxa i2c-sensor"
 
 SERIAL_CONSOLE = "115200 tts/0"
 
@@ -30,14 +30,16 @@ include conf/machine/include/tune-xscale.conf
 #include conf/machine/include/tune-iwmmxt.conf
 
 BOOTSTRAP_EXTRA_RRECOMMENDS += "${@linux_module_packages('${UN_MODULES}', d)}"
-UN_MODULES = "i2c-pxa snd-pxa-i2sound-htcuniversal htcuniversal_power htcuniversal_acx acx htcuniversal_bt htcuniversal_leds"
+UN_MODULES = "i2c-pxa snd-pxa-i2sound-htcuniversal htcuniversal_power htcuniversal_acx acx htcuniversal_bt htcuniversal_leds firmware-class"
 
 
 module_autoload_htcuniversal_power = "htcuniversal_power"
 module_autoload_snd-pxa-i2sound-htcuniversal = "snd-pxa-i2sound-htcuniversal"
 module_autoload_snd-pcm-oss = "snd-pcm-oss"
 module_autoload_snd-mixer-oss = "snd-mixer-oss"
+module_autoload_firmware-class = "firmware-class"
 module_autoload_acx = "acx"
+module_autoload_htcuniversal-acx = "htcuniversal_acx"
 module_autoload_htcuniversal-bt = "htcuniversal_bt"
 module_autoload_htcuniversal-power = "htcuniversal_power"
 
diff --git a/conf/machine/include/smartphone-common.conf b/conf/machine/include/smartphone-common.conf
index 2ff8d4bc47..bd5983cdc0 100644
--- a/conf/machine/include/smartphone-common.conf
+++ b/conf/machine/include/smartphone-common.conf
@@ -3,6 +3,7 @@ ipsec \
 nvrd \
 mip6-mn \
 tun \
+nls-base nls-cp437 nls-iso8859-1 \
 fat vfat \
 loop \
 rfcomm bnep l2cap sco hci_uart hidp \
diff --git a/conf/machine/ipaq-pxa270.conf b/conf/machine/ipaq-pxa270.conf
index f5cc893c9c..9ed313334b 100644
--- a/conf/machine/ipaq-pxa270.conf
+++ b/conf/machine/ipaq-pxa270.conf
@@ -22,7 +22,8 @@ MODUTILS = "26"
 PCMCIA_MANAGER = "pcmciautils"
 BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params "
 BOOTSTRAP_EXTRA_RRECOMMENDS += "${@linux_module_packages('${PXA270_MODULES}', d)}" 
-BOOTSTRAP_EXTRA_RDEPENDS_append = " udev module-init-tools"
+BOOTSTRAP_EXTRA_RDEPENDS_append = " udev"
+BOOTSTRAP_EXTRA_RDEPENDS_append = " tiinit acx-firmware"
 
 PXA270_MODULES = "g_ether g_file_storage g_serial gadgetfs pxa27x_udc \
 		  snd_pcm_oss snd_mixer_oss evdev mmc_block pcmcia hidp \
@@ -41,8 +42,12 @@ include conf/machine/include/tune-xscale.conf
 #include conf/machine/include/tune-iwmmxt.conf
 
 BOOTSTRAP_EXTRA_RRECOMMENDS += "${@linux_module_packages('${HX4700_MODULES}', d)}"
-HX4700_MODULES = "i2c-pxa asic3_mmc hx4700_bt hx4700_leds hx4700_navpt hx4700_pcmcia \
-                  hx4700_ts hx4700_wlan snd_hx4700_audio hx4700_power"
+
+# These modules are now compiled into the kernel:
+#HX4700_MODULES = "asic3_mmc hx4700_bt hx4700_leds hx4700_navpt \
+#                  hx4700_pcmcia hx4700_ts hx4700_power"
+
+HX4700_MODULES = "i2c-pxa hx4700_voltage hx4700_acx snd_hx4700_audio"
 
 
 module_autoload_evdev = "evdev"
diff --git a/packages/asterisk/asterisk-1.2.9.1/uclibc-compat-getloadavg.patch b/packages/asterisk/asterisk-1.2.9.1/uclibc-compat-getloadavg.patch
new file mode 100644
index 0000000000..a909513b1c
--- /dev/null
+++ b/packages/asterisk/asterisk-1.2.9.1/uclibc-compat-getloadavg.patch
@@ -0,0 +1,13 @@
+diff -ruN asterisk-1.2.0-old/include/asterisk/compat.h asterisk-1.2.0-new/include/asterisk/compat.h
+--- asterisk-1.2.0-old/include/asterisk/compat.h	2005-11-08 05:13:19.000000000 +0100
++++ asterisk-1.2.0-new/include/asterisk/compat.h	2005-12-04 05:32:31.000000000 +0100
+@@ -75,7 +75,9 @@
+ #define HAVE_STRTOQ
+ 
+ #ifdef _BSD_SOURCE
++#ifndef __UCLIBC__
+ #define HAVE_GETLOADAVG
++#endif /* __UCLIBC__ */
+ #endif
+ 
+ #ifdef __linux__
diff --git a/packages/asterisk/asterisk-1.2.9.1/uclibc-dsn.patch b/packages/asterisk/asterisk-1.2.9.1/uclibc-dsn.patch
new file mode 100644
index 0000000000..23657bcc76
--- /dev/null
+++ b/packages/asterisk/asterisk-1.2.9.1/uclibc-dsn.patch
@@ -0,0 +1,18 @@
+diff -ruN asterisk-1.0.7-old/dns.c asterisk-1.0.7-new/dns.c
+--- asterisk-1.0.7-old/dns.c	2004-06-22 22:11:15.000000000 +0200
++++ asterisk-1.0.7-new/dns.c	2005-03-19 17:38:06.000000000 +0100
+@@ -153,7 +153,13 @@
+ 
+ #if defined(res_ninit)
+ #define HAS_RES_NINIT
+-#else
++#endif
++
++#ifdef __UCLIBC__
++#undef HAS_RES_NINIT
++#endif
++
++#ifndef HAS_RES_NINIT
+ AST_MUTEX_DEFINE_STATIC(res_lock);
+ #if 0
+ #warning "Warning, res_ninit is missing...  Could have reentrancy issues"
diff --git a/packages/asterisk/asterisk_1.2.9.1.bb b/packages/asterisk/asterisk_1.2.9.1.bb
index b08e178388..46f24c0e35 100644
--- a/packages/asterisk/asterisk_1.2.9.1.bb
+++ b/packages/asterisk/asterisk_1.2.9.1.bb
@@ -2,9 +2,11 @@ DESCRIPTION="The Asterisk open source software PBX"
 HOMEPAGE="www.asterisk.org"
 LICENSE="GPL"
 DEPENDS="ncurses zlib openssl curl alsa-lib libogg libvorbis popt"
-PR = "r4"
+PR = "r5"
 
 SRC_URI="http://ftp.digium.com/pub/asterisk/releases/asterisk-${PV}.tar.gz \
+	 file://uclibc-compat-getloadavg.patch;patch=1 \
+	 file://uclibc-dsn.patch;patch=1 \
          file://asterisk.patch;patch=1"
 
 
diff --git a/packages/mplayer/mplayer-1.0pre7+cvs20060519/.mtn2git_empty b/packages/dillo/dillo-0.8.6/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/mplayer/mplayer-1.0pre7+cvs20060519/.mtn2git_empty
+++ b/packages/dillo/dillo-0.8.6/.mtn2git_empty
diff --git a/packages/dillo/dillo-0.8.6/dillo.desktop b/packages/dillo/dillo-0.8.6/dillo.desktop
new file mode 100644
index 0000000000..6c5f994da4
--- /dev/null
+++ b/packages/dillo/dillo-0.8.6/dillo.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Web browser
+Comment=Dillo
+Exec=dillo
+Terminal=0
+Type=Application
+Icon=dillo.png
+Categories=Application;PIM;GPE
+StartupNotify=True
diff --git a/packages/dillo/dillo-0.8.6/dillo.png b/packages/dillo/dillo-0.8.6/dillo.png
new file mode 100644
index 0000000000..99c942f190
--- /dev/null
+++ b/packages/dillo/dillo-0.8.6/dillo.png
diff --git a/packages/dillo/dillo-0.8.6/font.patch b/packages/dillo/dillo-0.8.6/font.patch
new file mode 100644
index 0000000000..ace3da8dd6
--- /dev/null
+++ b/packages/dillo/dillo-0.8.6/font.patch
@@ -0,0 +1,15 @@
+--- dillo-0.8.5/src/dw_style.c.orig	2005-12-20 13:01:19.000000000 +0000
++++ dillo-0.8.5/src/dw_style.c	2005-12-20 13:03:34.000000000 +0000
+@@ -330,6 +330,12 @@
+       }
+ 
+       if (font->font == NULL) {
++        /* Try another platform-font that should be available. (fam83) */
++        font->font =
++           gdk_font_load
++           ("-misc-fixed-medium-r-semicondensed--13-100-100-100-c-60-iso8859-1");
++			      }
++      if (font->font == NULL) {
+          /* Can't load any suitable font!  */
+          g_warning ("Can't load any ISO8859-1 font!?! :(");
+          font->font =
diff --git a/packages/dillo/dillo_0.8.6.bb b/packages/dillo/dillo_0.8.6.bb
new file mode 100644
index 0000000000..be4a59b034
--- /dev/null
+++ b/packages/dillo/dillo_0.8.6.bb
@@ -0,0 +1,31 @@
+SECTION = "x11/network"
+DESCRIPTION = "Lightweight gtk+ browser."
+LICENSE = "GPL"
+DEPENDS = "gtk+-1.2 libpng"
+SRC_URI="http://www.dillo.org/download/dillo-${PV}.tar.bz2 \
+         file://font.patch;patch=1 \
+	 file://dillo.desktop \
+	 file://dillo.png"
+	 
+
+MAINTAINER = "Graeme Gregory <dp@xora.org.uk>"
+PRIORITY = "optional"
+
+RCONFLICTS = "dillo2"
+
+S = "${WORKDIR}/dillo-${PV}/"
+
+inherit autotools pkgconfig
+
+FILES_${PN} += " /usr/lib/dillo/ /usr/bin/dpid /usr/bin/dpidc "
+
+export PNG_CONFIG = "${STAGING_BINDIR}/libpng-config"
+
+EXTRA_OECONF = "--disable-dlgui"
+
+do_install_append() {
+        install -d ${D}${datadir}/applications
+        install -d ${D}${datadir}/pixmaps
+        install -m 0644 ${WORKDIR}/dillo.desktop ${D}${datadir}/applications/dillo.desktop
+        install -m 0644 ${WORKDIR}/dillo.png ${D}${datadir}/pixmaps/dillo.png
+}
diff --git a/packages/links/links-x11_2.1pre22.bb b/packages/links/links-x11_2.1pre22.bb
new file mode 100644
index 0000000000..f763df7f60
--- /dev/null
+++ b/packages/links/links-x11_2.1pre22.bb
@@ -0,0 +1,21 @@
+LICENSE = "GPL"
+SECTION = "console/network"
+DEPENDS = "jpeg libpng flex openssl zlib libx11"
+DESCRIPTION = "Links is graphics and text mode WWW \
+browser, similar to Lynx."
+RCONFLICTS = "links"
+
+MAINTAINER = "Graeme Gregory <dp@xora.org.uk>"
+
+SRC_URI = "http://links.twibright.com/download/links-${PV}.tar.bz2 \
+           file://ac-prog-cxx.patch;patch=1"
+
+inherit autotools
+
+EXTRA_OECONF = "--enable-javascript --with-libfl --enable-graphics \
+	        --with-ssl=${STAGING_LIBDIR}/.. --with-libjpeg \
+	        --without-libtiff --without-svgalib --without-fb \
+	        --without-directfb --without-pmshell --without-atheos \
+	        --with-x --without-gpm --without-sdl"
+
+S = "${WORKDIR}/links-${PV}"
diff --git a/packages/links/links_2.1pre22.bb b/packages/links/links_2.1pre22.bb
new file mode 100644
index 0000000000..e0a991e148
--- /dev/null
+++ b/packages/links/links_2.1pre22.bb
@@ -0,0 +1,19 @@
+LICENSE = "GPL"
+SECTION = "console/network"
+DEPENDS = "jpeg libpng gpm flex openssl zlib"
+DESCRIPTION = "Links is graphics and text mode WWW \
+browser, similar to Lynx."
+RCONFLICTS="links-x11"
+
+MAINTAINER = "Graeme Gregory <dp@xora.org.uk>"
+
+SRC_URI = "http://links.twibright.com/download/links-${PV}.tar.bz2 \
+           file://ac-prog-cxx.patch;patch=1"
+
+inherit autotools
+
+EXTRA_OECONF = "--enable-javascript --with-libfl --enable-graphics \
+	        --with-ssl=${STAGING_LIBDIR}/.. --with-libjpeg \
+	        --without-libtiff --without-svgalib --with-fb \
+	        --without-directfb --without-pmshell --without-atheos \
+	        --without-x --without-sdl"
diff --git a/packages/linux/linux-openzaurus_2.6.16+git.bb b/packages/linux/linux-openzaurus_2.6.16+git.bb
index 9977b7e2a7..a268ea2dfa 100644
--- a/packages/linux/linux-openzaurus_2.6.16+git.bb
+++ b/packages/linux/linux-openzaurus_2.6.16+git.bb
@@ -16,21 +16,20 @@ DEFAULT_PREFERENCE = "-1"
 # Hacks should clearly named and at the bottom
 #           ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.14-rc2/2.6.14-rc2-mm1/2.6.14-rc2-mm1.bz2;patch=1 \	   
 SRC_URI = "git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;tag=553698f944ed715dfe023b4cef07601f0ce735f0 \
+           ${RPSRC}/poodle_partsize-r0.patch;patch=1;status=merged \
+           ${RPSRC}/jffs2_longfilename-r1.patch;patch=1;status=merged \
+           ${RPSRC}/locomo_led_default_trigger-r0.patch;patch=1;status=merged \
+           ${RPSRC}/zaurus_reboot-r3.patch;patch=1;status=merged \
+           ${RPSRC}/poodle_mmcsd_fix-r0.patch;patch=1;status=merged \
+           ${RPSRC}/poodle_ssp-r1.patch;patch=1;status=merged \
+           ${RPSRC}/sharpsl_pm-do-r2.patch;patch=1;status=merged \
            ${RPSRC}/zlib_inflate-r3.patch;patch=1;status=pending \
            ${RPSRC}/logo_rotate_fix-r1.patch;patch=1;status=pending \
-           ${RPSRC}/poodle_partsize-r0.patch;patch=1;status=pending \
-           ${RPSRC}/jffs2_longfilename-r1.patch;patch=1;status=pending \
            ${RPSRC}/collie_frontlight-r6.patch;patch=1;status=pending \
+           ${RPSRC}/input_modalias_fix-r0.patch;patch=1;status=pending \
            file://00-hostap.patch;patch=1;status=pending \
            file://10-pcnet.patch;patch=1;status=pending \
-           ${RPSRC}/zaurus_reboot-r3.patch;patch=1 \
-           ${RPSRC}/poodle_mmcsd_fix-r0.patch;patch=1 \
-           ${RPSRC}/poodle_ssp-r1.patch;patch=1 \
-           ${RPSRC}/locomo_led_default_trigger-r0.patch;patch=1 \
-           ${RPSRC}/sharpsl_pm-do-r2.patch;patch=1 \
-           ${RPSRC}/mmcsd_large_cards-r0.patch;patch=1 \
-           ${RPSRC}/mmcsd_no_scr_check-r0.patch;patch=1 \
-#           ${RPSRC}/alsa/asoc-v0.10rc8.patch;patch=1 \
+#           ${RPSRC}/alsa/asoc-v0.10-oz-r0.patch;patch=1 \
            ${RPSRC}/alsa/asoc-v0.10rc4.patch;patch=1 \
            ${RPSRC}/asoc_fixups-r1.patch;patch=1 \
            ${RPSRC}/hx2750_base-r25.patch;patch=1 \
@@ -49,12 +48,15 @@ SRC_URI = "git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.gi
            ${DOSRC}/kexec-arm-r2.patch;patch=1 \
            ${RPSRC}/locomo_kbd_tweak-r0.patch;patch=1 \
            ${RPSRC}/poodle_pm-r1.patch;patch=1 \
+           ${RPSRC}/pxafb_changeres-r0.patch;patch=1 \
            file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;patch=1 \
            file://hrw-pcmcia-ids-r2.patch;patch=1 \
            ${RPSRC}/logo_oh-r0.patch.bz2;patch=1;status=unmergable \
            ${RPSRC}/logo_oz-r2.patch.bz2;patch=1;status=unmergable \
            ${RPSRC}/pxa-linking-bug.patch;patch=1;status=unmergable \
            file://add-oz-release-string.patch;patch=1;status=unmergable \
+           ${RPSRC}/mmcsd_large_cards-r0.patch;patch=1;status=hack \
+           ${RPSRC}/mmcsd_no_scr_check-r0.patch;patch=1;status=hack \
            ${RPSRC}/integrator_rgb-r0.patch;patch=1;status=hack \
            ${RPSRC}/pxa_cf_initorder_hack-r1.patch;patch=1;status=hack \
            file://pxa-serial-hack.patch;patch=1;status=hack \
@@ -78,15 +80,10 @@ SRC_URI = "git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.gi
 #           http://tglx.de/projects/armirq/2.6.17-rc3/patch-2.6.17-rc3-armirq4.patch;patch=1 \
 #           ${RPSRC}/../pxa27x_overlay-r0.patch;patch=1 \
 
-# These patches would really help collie/poodle but we 
-# need someone to maintain them
-# ${JLSRC}/zaurus-lcd-2.6.11.diff.gz;patch=1 
-#   (Pavel Machek's git tree has updated versions of this?)
-#   Also parts were recently committed to mainline by rmk (drivers/mfd/)
-# ${JLSRC}/zaurus-base-2.6.11.diff.gz;patch=1 
-#   (This is mostly in mainline now?)
-# ${JLSRC}/zaurus-local-2.6.11.diff.gz;patch=1 \
-# ${JLSRC}/zaurus-leds-2.6.11.diff.gz;patch=1 \
+# Is anything out of this still needed? Parts were commited to mainline by rmk (drivers/mfd/)
+# (Pavel Machek's git tree has updated versions of this?)
+#  ${JLSRC}/zaurus-lcd-2.6.11.diff.gz;patch=1 
+
 
 SRC_URI_append_tosa = "\
 	   ${CHSRC}/usb-ohci-hooks-r1.patch;patch=1 \
diff --git a/packages/linux/linux-openzaurus_2.6.16.bb b/packages/linux/linux-openzaurus_2.6.16.bb
index c35d1d8e75..08a64160c1 100644
--- a/packages/linux/linux-openzaurus_2.6.16.bb
+++ b/packages/linux/linux-openzaurus_2.6.16.bb
@@ -67,8 +67,6 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 \
            ${RPSRC}/jffs2_longfilename-r1.patch;patch=1;status=pending \
            file://00-hostap.patch;patch=1;status=pending \
            file://10-pcnet.patch;patch=1;status=pending \
-           ${RPSRC}/mmcsd_large_cards-r0.patch;patch=1 \
-           ${RPSRC}/mmcsd_no_scr_check-r0.patch;patch=1 \
            ${RPSRC}/alsa/asoc-v0.10rc4.patch;patch=1 \
            ${RPSRC}/asoc_fixups-r0.patch;patch=1 \
            ${RPSRC}/hx2750_base-r24.patch;patch=1 \
@@ -80,11 +78,11 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 \
            ${RPSRC}/pxa_timerfix-r0.patch;patch=1 \
            ${RPSRC}/input_power-r4.patch;patch=1 \
            ${RPSRC}/pxa25x_cpufreq-r0.patch;patch=1 \
-           ${RPSRC}/collie_frontlight-r1.patch;patch=1 \
-           ${RPSRC}/zaurus_reboot-r0.patch;patch=1 \
+           ${RPSRC}/collie_frontlight-r1.patch;patch=1;status=pending \
+           ${RPSRC}/zaurus_reboot-r0.patch;patch=1;status=merged \
            ${RPSRC}/sharpsl_pm_fixes1-r0.patch;patch=1 \
            ${RPSRC}/pm_changes-r1.patch;patch=1 \
-           ${RPSRC}/sharpsl_pm-do-r2.patch;patch=1 \
+           ${RPSRC}/sharpsl_pm-do-r2.patch;patch=1;status=merged \
            ${RPSRC}/usb_pxa27x_udc-r0.patch;patch=1 \
            ${RPSRC}/usb_add_epalloc-r1.patch;patch=1 \
            ${DOSRC}/kexec-arm-r2.patch;patch=1 \
@@ -97,6 +95,8 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 \
            ${RPSRC}/logo_oz-r2.patch.bz2;patch=1;status=unmergable \
            ${RPSRC}/pxa-linking-bug.patch;patch=1;status=unmergable \
            file://add-oz-release-string.patch;patch=1;status=unmergable \
+           ${RPSRC}/mmcsd_large_cards-r0.patch;patch=1;status=hack \
+           ${RPSRC}/mmcsd_no_scr_check-r0.patch;patch=1;status=hack \
            ${RPSRC}/integrator_rgb-r0.patch;patch=1;status=hack \
            ${RPSRC}/pxa_cf_initorder_hack-r1.patch;patch=1;status=hack \
            ${RPSRC}/poodle_ts_hack-r0.patch;patch=1;status=hack \
diff --git a/packages/linux/linux-openzaurus_2.6.17.bb b/packages/linux/linux-openzaurus_2.6.17.bb
index dae8e49e68..cb3f0a6313 100644
--- a/packages/linux/linux-openzaurus_2.6.17.bb
+++ b/packages/linux/linux-openzaurus_2.6.17.bb
@@ -1,6 +1,6 @@
 include linux-openzaurus.inc
 
-PR = "r1"
+PR = "r2"
 
 DEFAULT_PREFERENCE = "-1"
 
@@ -16,21 +16,20 @@ DEFAULT_PREFERENCE = "-1"
 # Hacks should clearly named and at the bottom
 #           ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.14-rc2/2.6.14-rc2-mm1/2.6.14-rc2-mm1.bz2;patch=1 \	   
 SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.17.tar.bz2 \
+           ${RPSRC}/poodle_partsize-r0.patch;patch=1;status=merged \
+           ${RPSRC}/jffs2_longfilename-r1.patch;patch=1;status=merged \
+           ${RPSRC}/locomo_led_default_trigger-r0.patch;patch=1;status=merged \
+           ${RPSRC}/zaurus_reboot-r3.patch;patch=1;status=merged \
+           ${RPSRC}/poodle_mmcsd_fix-r0.patch;patch=1;status=merged \
+           ${RPSRC}/poodle_ssp-r1.patch;patch=1;status=merged \
+           ${RPSRC}/sharpsl_pm-do-r2.patch;patch=1;status=merged \
            ${RPSRC}/zlib_inflate-r3.patch;patch=1;status=pending \
            ${RPSRC}/logo_rotate_fix-r1.patch;patch=1;status=pending \
-           ${RPSRC}/poodle_partsize-r0.patch;patch=1;status=pending \
-           ${RPSRC}/jffs2_longfilename-r1.patch;patch=1;status=pending \
            ${RPSRC}/collie_frontlight-r6.patch;patch=1;status=pending \
+           ${RPSRC}/input_modalias_fix-r0.patch;patch=1;status=pending \
            file://00-hostap.patch;patch=1;status=pending \
            file://10-pcnet.patch;patch=1;status=pending \
-           ${RPSRC}/zaurus_reboot-r3.patch;patch=1 \
-           ${RPSRC}/poodle_mmcsd_fix-r0.patch;patch=1 \
-           ${RPSRC}/poodle_ssp-r1.patch;patch=1 \
-           ${RPSRC}/locomo_led_default_trigger-r0.patch;patch=1 \
-           ${RPSRC}/sharpsl_pm-do-r2.patch;patch=1 \
-           ${RPSRC}/mmcsd_large_cards-r0.patch;patch=1 \
-           ${RPSRC}/mmcsd_no_scr_check-r0.patch;patch=1 \
-#           ${RPSRC}/alsa/asoc-v0.10rc8.patch;patch=1 \
+#           ${RPSRC}/alsa/asoc-v0.10-oz-r0.patch;patch=1 \
            ${RPSRC}/alsa/asoc-v0.10rc4.patch;patch=1 \
            ${RPSRC}/asoc_fixups-r1.patch;patch=1 \
            ${RPSRC}/hx2750_base-r25.patch;patch=1 \
@@ -49,12 +48,15 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.17.tar.bz2 \
            ${DOSRC}/kexec-arm-r2.patch;patch=1 \
            ${RPSRC}/locomo_kbd_tweak-r0.patch;patch=1 \
            ${RPSRC}/poodle_pm-r1.patch;patch=1 \
+           ${RPSRC}/pxafb_changeres-r0.patch;patch=1 \
            file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;patch=1 \
            file://hrw-pcmcia-ids-r2.patch;patch=1 \
            ${RPSRC}/logo_oh-r0.patch.bz2;patch=1;status=unmergable \
            ${RPSRC}/logo_oz-r2.patch.bz2;patch=1;status=unmergable \
            ${RPSRC}/pxa-linking-bug.patch;patch=1;status=unmergable \
            file://add-oz-release-string.patch;patch=1;status=unmergable \
+           ${RPSRC}/mmcsd_large_cards-r0.patch;patch=1;status=hack \
+           ${RPSRC}/mmcsd_no_scr_check-r0.patch;patch=1;status=hack \
            ${RPSRC}/integrator_rgb-r0.patch;patch=1;status=hack \
            ${RPSRC}/pxa_cf_initorder_hack-r1.patch;patch=1;status=hack \
            file://pxa-serial-hack.patch;patch=1;status=hack \
@@ -78,15 +80,10 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.17.tar.bz2 \
 #           http://tglx.de/projects/armirq/2.6.17-rc3/patch-2.6.17-rc3-armirq4.patch;patch=1 \
 #           ${RPSRC}/../pxa27x_overlay-r0.patch;patch=1 \
 
-# These patches would really help collie/poodle but we 
-# need someone to maintain them
-# ${JLSRC}/zaurus-lcd-2.6.11.diff.gz;patch=1 
-#   (Pavel Machek's git tree has updated versions of this?)
-#   Also parts were recently committed to mainline by rmk (drivers/mfd/)
-# ${JLSRC}/zaurus-base-2.6.11.diff.gz;patch=1 
-#   (This is mostly in mainline now?)
-# ${JLSRC}/zaurus-local-2.6.11.diff.gz;patch=1 \
-# ${JLSRC}/zaurus-leds-2.6.11.diff.gz;patch=1 \
+# Is anything out of this still needed? Parts were commited to mainline by rmk (drivers/mfd/)
+# (Pavel Machek's git tree has updated versions of this?)
+#  ${JLSRC}/zaurus-lcd-2.6.11.diff.gz;patch=1 
+
 
 SRC_URI_append_tosa = "\
 	   ${CHSRC}/usb-ohci-hooks-r1.patch;patch=1 \
diff --git a/packages/mplayer/mplayer-1.0pre7+cvs20060519/Makefile.patch b/packages/mplayer/files/Makefile.patch
index da316ad129..da316ad129 100644
--- a/packages/mplayer/mplayer-1.0pre7+cvs20060519/Makefile.patch
+++ b/packages/mplayer/files/Makefile.patch
diff --git a/packages/mplayer/files/libfaad-fixed.patch b/packages/mplayer/files/libfaad-fixed.patch
new file mode 100644
index 0000000000..2b85179038
--- /dev/null
+++ b/packages/mplayer/files/libfaad-fixed.patch
@@ -0,0 +1,16 @@
+--- mplayer-1.1.5/libfaad2/Makefile.orig	2006-05-12 14:45:49.000000000 +0100
++++ mplayer-1.1.5/libfaad2/Makefile	2006-05-12 14:46:36.000000000 +0100
+@@ -6,11 +6,11 @@
+ SRCS    = bits.c cfft.c common.c decoder.c drc.c error.c filtbank.c hcr.c huffman.c ic_predict.c is.c lt_predict.c mdct.c mp4.c ms.c output.c pns.c ps_dec.c ps_syntax.c  pulse.c rvlc.c sbr_dct.c sbr_dec.c sbr_e_nf.c sbr_fbt.c sbr_hfadj.c sbr_hfgen.c sbr_huff.c sbr_qmf.c sbr_syntax.c sbr_tf_grid.c specrec.c ssr.c ssr_fb.c ssr_ipqf.c syntax.c tns.c
+ OBJS	= $(SRCS:.c=.o)
+ 
+-CFLAGS  = -I. $(OPTFLAGS) 
++#CFLAGS  = -I. $(OPTFLAGS) 
+ 
+ # Uncomment this to use the FIXED_POINT implementation of FAAD2.
+ # This should improve performance, especially for SBR files.
+-#CFLAGS  = -I. $(OPTFLAGS) -DFIXED_POINT
++CFLAGS  = -I. $(OPTFLAGS) -DFIXED_POINT
+ 
+ .SUFFIXES: .c .o
+ 
diff --git a/packages/mplayer/mplayer-1.0pre7+cvs20060519/vo_w100.c b/packages/mplayer/files/vo_w100.c
index 702707c656..702707c656 100644
--- a/packages/mplayer/mplayer-1.0pre7+cvs20060519/vo_w100.c
+++ b/packages/mplayer/files/vo_w100.c
diff --git a/packages/mplayer/mplayer-1.0pre7+cvs20060519/vo_w100_api.h b/packages/mplayer/files/vo_w100_api.h
index 59cf58be26..59cf58be26 100644
--- a/packages/mplayer/mplayer-1.0pre7+cvs20060519/vo_w100_api.h
+++ b/packages/mplayer/files/vo_w100_api.h
diff --git a/packages/mplayer/mplayer-1.0pre7+cvs20060519/vo_w100_fb.h b/packages/mplayer/files/vo_w100_fb.h
index 39318c645b..39318c645b 100644
--- a/packages/mplayer/mplayer-1.0pre7+cvs20060519/vo_w100_fb.h
+++ b/packages/mplayer/files/vo_w100_fb.h
diff --git a/packages/mplayer/mplayer-1.0pre7+cvs20060519/w100-Makefile.patch b/packages/mplayer/files/w100-Makefile.patch
index 01899556d3..01899556d3 100644
--- a/packages/mplayer/mplayer-1.0pre7+cvs20060519/w100-Makefile.patch
+++ b/packages/mplayer/files/w100-Makefile.patch
diff --git a/packages/mplayer/mplayer-1.0pre7+cvs20060519/w100-configure.patch b/packages/mplayer/files/w100-configure.patch
index 03610610e4..03610610e4 100644
--- a/packages/mplayer/mplayer-1.0pre7+cvs20060519/w100-configure.patch
+++ b/packages/mplayer/files/w100-configure.patch
diff --git a/packages/mplayer/mplayer-1.0pre7+cvs20060519/w100-mplayer.patch b/packages/mplayer/files/w100-mplayer.patch
index 4bed6326d1..4bed6326d1 100644
--- a/packages/mplayer/mplayer-1.0pre7+cvs20060519/w100-mplayer.patch
+++ b/packages/mplayer/files/w100-mplayer.patch
diff --git a/packages/mplayer/mplayer-1.0pre7+cvs20060519/w100-video_out.patch b/packages/mplayer/files/w100-video_out.patch
index 9855853fe6..9855853fe6 100644
--- a/packages/mplayer/mplayer-1.0pre7+cvs20060519/w100-video_out.patch
+++ b/packages/mplayer/files/w100-video_out.patch
diff --git a/packages/mplayer/mplayer_1.0pre7+cvs20060519.bb b/packages/mplayer/mplayer_1.0pre8.bb
index 9298f0645c..a55c59dc96 100644
--- a/packages/mplayer/mplayer_1.0pre7+cvs20060519.bb
+++ b/packages/mplayer/mplayer_1.0pre8.bb
@@ -5,8 +5,7 @@ HOMEPAGE = "http://www.mplayerhq.hu/"
 DEPENDS = "virtual/libsdl libmad zlib libpng jpeg mplayer-common"
 RDEPENDS = "mplayer-common"
 LICENSE = "GPL"
-SRC_URI = "http://www.xora.org.uk/oe/mplayer_20060519.tar.bz2 \
-           http://www.xora.org.uk/oe/ffmpeg_20060519.tar.bz2 \
+SRC_URI = "http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-${PV}.tar.bz2 \
 	   file://vo_w100.c \
 	   file://vo_w100_api.h \
 	   file://vo_w100_fb.h \
@@ -25,7 +24,7 @@ PARALLEL_MAKE = ""
 
 DEPENDS_append_c7x0 = " sharp-aticore-oss"
 
-S = "${WORKDIR}/mplayer_20060519"
+S = "${WORKDIR}/MPlayer-${PV}"
 
 PACKAGES =+ "mencoder"
 
@@ -60,7 +59,6 @@ EXTRA_OECONF = " \
 EXTRA_OECONF_append_c7x0 = " --enable-w100 "
 
 do_configure() {
-	cp -r ${WORKDIR}/ffmpeg_20060519/libavcodec ${WORKDIR}/ffmpeg_20060519/libavutil ${WORKDIR}/ffmpeg_20060519/libavformat ${S}
 	cp ${WORKDIR}/vo_w100.c ${S}/libvo
 	cp ${WORKDIR}/vo_w100_api.h ${S}/libvo
 	cp ${WORKDIR}/vo_w100_fb.h ${S}/libvo
diff --git a/packages/mplayer/mplayer_svn.bb b/packages/mplayer/mplayer_svn.bb
new file mode 100644
index 0000000000..7af431430b
--- /dev/null
+++ b/packages/mplayer/mplayer_svn.bb
@@ -0,0 +1,74 @@
+DESCRIPTION = "Open Source multimedia player."
+SECTION = "opie/multimedia"
+PRIORITY = "optional"
+HOMEPAGE = "http://www.mplayerhq.hu/"
+DEPENDS = "virtual/libsdl libmad zlib libpng jpeg mplayer-common"
+RDEPENDS = "mplayer-common"
+LICENSE = "GPL"
+SRC_URI = "svn://svn.mplayerhq.hu/;module=mplayer \
+	   file://vo_w100.c \
+	   file://vo_w100_api.h \
+	   file://vo_w100_fb.h \
+	   file://Makefile.patch;patch=1 \
+	   file://w100-configure.patch;patch=1 \
+	   file://w100-Makefile.patch;patch=1 \
+	   file://w100-video_out.patch;patch=1 \
+	   file://w100-mplayer.patch;patch=1"
+
+MAINTAINER="Graeme Gregory <dp@xora.org.uk>"
+RCONFLICTS_${PN} = "mplayer-atty"
+RREPLACES_${PN} = "mplayer-atty"
+
+PV = "1.0pre8+svn${SRCDATE}"
+PR = "r0"
+DEFAULT_PREFERENCE = "-1"
+
+PARALLEL_MAKE = ""
+
+DEPENDS_append_c7x0 = " sharp-aticore-oss"
+
+S = "${WORKDIR}/mplayer/trunk/"
+
+PACKAGES =+ "mencoder"
+
+FILES_${PN} = "${bindir}/mplayer"
+FILES_mencoder = "${bindir}/mencoder"
+
+inherit autotools
+
+EXTRA_OECONF = " \
+        --prefix=/usr \
+	--mandir=${mandir} \
+        --target=${TARGET_SYS} \
+	\
+	--enable-mencoder \
+	--disable-gui \
+	--enable-largefiles \
+	--disable-linux-devfs \
+	--disable-lirc \
+	--disable-lircc \
+	--disable-tv \
+	--enable-rtc \
+	--disable-smb \
+	--disable-win32 \
+	\
+	--enable-tremor-low \
+	--disable-mp3lib \
+	\
+	--disable-x11 \
+	--enable-sdl \
+	--enable-fbdev "
+
+EXTRA_OECONF_append_c7x0 = " --enable-w100 "
+
+do_configure() {
+	cp ${WORKDIR}/vo_w100.c ${S}/libvo
+	cp ${WORKDIR}/vo_w100_api.h ${S}/libvo
+	cp ${WORKDIR}/vo_w100_fb.h ${S}/libvo
+        ./configure ${EXTRA_OECONF}
+}
+
+do_compile () {
+	oe_runmake
+}
+
diff --git a/packages/nunome/.mtn2git_empty b/packages/nunome/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/nunome/.mtn2git_empty
diff --git a/packages/nunome/files/.mtn2git_empty b/packages/nunome/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/nunome/files/.mtn2git_empty
diff --git a/packages/nunome/files/nunome.patch b/packages/nunome/files/nunome.patch
new file mode 100644
index 0000000000..450e16041c
--- /dev/null
+++ b/packages/nunome/files/nunome.patch
@@ -0,0 +1,197 @@
+# Signed off by Michael 'Mickey' Lauer <mickey@Vanille.de>
+--- nunome/dicman/nnmDicman.cpp~nunome.patch
++++ nunome/dicman/nnmDicman.cpp
+@@ -1,75 +1,4 @@
+-/* 
+-   $Id: nnmDicman.cpp,v 1.1.1.1 2005/06/29 22:24:22 leggewie Exp $
+-
+-   Copyright (C) 2001-2002 AXE,Inc. <sg@axe-inc.co.jp>
+-
+-   This file is part of Nunome-Qtopia.
+-
+-   Nunome-Qtopia is free software; you can redistribute it and/or modify it
+-   under the terms of the GNU General Public License as published by
+-   the Free Software Foundation; either version 2, or (at your option)
+-   any later version.
+-
+-   Nunome-Qtopia is distributed in the hope that it will be useful, but
+-   WITHOUT ANY WARRANTY; without even the implied warranty of
+-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-   GNU General Public License for more details.
+-
+-   You should have received a copy of the GNU General Public License
+-   along with Nunome; see the file COPYING.   If not, write to
+-   the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
+-
+-/* Dictinary maintenance tool */
+-
+-#include	<qpeapplication.h>
+-#include	<qlabel.h>
+-#include	<qpainter.h>
+-#include	<qpixmap.h>
+-#include	<qwidget.h>
+-#include	<qlayout.h>
+-#include	<qpushbutton.h>
+-#include	<qlineedit.h>
+-
+-#include	<stdio.h>
+-#include	<stdlib.h>
+-#include	<unistd.h>
+-#include	<sys/types.h>
+-#include	<signal.h>
+-
+-extern "C" {
+-#include	"Nnm.h"
+-#include	"NnmFeature.h"
+-#include	"nnmStub.h"
+-#include	"NnmProto.h"
+-}
+-#include	"nnmCanvas.h"
+-
+-class uiWidget : public QWidget
+-{
+-Q_OBJECT
+-
+-public:
+-	uiWidget( QWidget *parent = 0, const char *name = 0, WFlags f=0 );
+-
+-	int		serverPID;
+-	char		*dictionaryPath;
+-
+-private slots:
+-	void	regist( void );
+-	void	clear( void );
+-	void	quit( void );
+-
+-	void	format( const QString & );
+-
+-private:
+-	nnmCanvas	*canvas;
+-	QLineEdit	*input;
+-	ulong		code;
+-
+-	void		updateDictionary( void );
+-};
+-
+-#include	"moc_nnmDicman.cpp"
++#include "nnmDicman.h"
+ 
+ uiWidget::uiWidget( QWidget *parent, const char *name, WFlags f )
+ 			: QWidget( parent, name, f )
+--- nunome/ui/nunome.cpp~nunome.patch
++++ nunome/ui/nunome.cpp
+@@ -22,7 +22,7 @@
+ 
+ /* Nunome input-method */
+ 
+-#include	<qpeapplication.h>
++#include	<qpe/qpeapplication.h>
+ #include	<qpainter.h>
+ #include	<qpixmap.h>
+ #include	<qwidget.h>
+--- nunome/ui/nunome.h~nunome.patch
++++ nunome/ui/nunome.h
+@@ -32,14 +32,14 @@
+ #include	"nnmSelect.h"
+ #include	"nnmSymbol.h"
+ 
+-#define	PARAMETER_FILE_PATH		"/usr/local/share/nunome/.nunome"
++#define	PARAMETER_FILE_PATH		"/opt/QtPalmtop/share/nunome/.nunome"
+ 
+-#define	DEFAULT_SYSTEM_DICTIONARY	"/usr/local/share/nunome/nunome_uni.dic"
+-#define	DEFAULT_USER_DICTIONARY		"/usr/local/share/nunome/user.dic"
++#define	DEFAULT_SYSTEM_DICTIONARY	"/opt/QtPalmtop/share/nunome/nunome_uni.dic"
++#define	DEFAULT_USER_DICTIONARY		"/opt/QtPalmtop/share/nunome/user.dic"
+ #define	DEFAULT_TIMEOUT_MSEC		500
+ #define	DEFAULT_LEARN_FLAG		true
+-#define	DEFAULT_SERVER_PROGRAM_PATH	"/usr/local/share/nunome/nnmsrv"
+-#define	DEFAULT_LEARN_PROGRAM_PATH	"/usr/local/share/nunome/nnmDicman"
++#define	DEFAULT_SERVER_PROGRAM_PATH	"/opt/QtPalmtop/bin/nnmsrv"
++#define	DEFAULT_LEARN_PROGRAM_PATH	"/opt/QtPalmtop/bin/nnmDicman"
+ 
+ class	nnmParameter
+ {
+--- nunome/ui/nunomeImpl.h~nunome.patch
++++ nunome/ui/nunomeImpl.h
+@@ -23,7 +23,7 @@
+ #ifndef	NUNOMEIMPL_H
+ #define	NUNOMEIMPL_H
+ 
+-#include	<inputmethodinterface.h>
++#include	<qpe/inputmethodinterface.h>
+ 
+ class	Nunome;
+ class	QPixmap;
+--- /dev/null
++++ nunome/dicman/nnmDicman.h
+@@ -0,0 +1,70 @@
++/* 
++   $Id: nnmDicman.cpp,v 1.1.1.1 2005/06/29 22:24:22 leggewie Exp $
++
++   Copyright (C) 2001-2002 AXE,Inc. <sg@axe-inc.co.jp>
++
++   This file is part of Nunome-Qtopia.
++
++   Nunome-Qtopia is free software; you can redistribute it and/or modify it
++   under the terms of the GNU General Public License as published by
++   the Free Software Foundation; either version 2, or (at your option)
++   any later version.
++
++   Nunome-Qtopia is distributed in the hope that it will be useful, but
++   WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++   GNU General Public License for more details.
++
++   You should have received a copy of the GNU General Public License
++   along with Nunome; see the file COPYING.   If not, write to
++   the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
++
++/* Dictinary maintenance tool */
++
++#include	<qpe/qpeapplication.h>
++#include	<qlabel.h>
++#include	<qpainter.h>
++#include	<qpixmap.h>
++#include	<qwidget.h>
++#include	<qlayout.h>
++#include	<qpushbutton.h>
++#include	<qlineedit.h>
++
++#include	<stdio.h>
++#include	<stdlib.h>
++#include	<unistd.h>
++#include	<sys/types.h>
++#include	<signal.h>
++
++extern "C" {
++#include	"Nnm.h"
++#include	"NnmFeature.h"
++#include	"nnmStub.h"
++#include	"NnmProto.h"
++}
++#include	"nnmCanvas.h"
++
++class uiWidget : public QWidget
++{
++Q_OBJECT
++
++public:
++	uiWidget( QWidget *parent = 0, const char *name = 0, WFlags f=0 );
++
++	int		serverPID;
++	char		*dictionaryPath;
++
++private slots:
++	void	regist( void );
++	void	clear( void );
++	void	quit( void );
++
++	void	format( const QString & );
++
++private:
++	nnmCanvas	*canvas;
++	QLineEdit	*input;
++	ulong		code;
++
++	void		updateDictionary( void );
++};
diff --git a/packages/nunome/nunome_1.0.1.bb b/packages/nunome/nunome_1.0.1.bb
new file mode 100644
index 0000000000..51ab8cee83
--- /dev/null
+++ b/packages/nunome/nunome_1.0.1.bb
@@ -0,0 +1,40 @@
+DESCRIPTION = "Japanese input method plugin"
+SECTION = "opie/inputmethods"
+PRIORITY = "optional"
+LICENSE = "GPL"
+HOMEPAGE = "http://www.sikigami.com/nunome-Qtopia-1.0/"
+RDEPENDS = "font-ttf-japanese"
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/gakusei/nunome-Qtopia-src-cleaned.tar.bz2 \
+	file://nunome.patch;patch=1"
+S = "${WORKDIR}/nunome"
+
+inherit opie
+
+EXTRA_QMAKEVARS_POST += "INCLUDEPATH+=${S}/Nnmlib INCLUDEPATH+=${S}/ui LIBS+=-L${S}"
+PARALLEL_MAKE = ""
+
+do_configure_prepend() {
+	echo -e "TEMPLATE=subdirs\nSUBDIRS=Nnmlib server ui dicman ui" >nunome.pro
+	pushd Nnmlib && qmake -project -t lib && popd
+	pushd server && qmake -project && echo -e "LIBS+=-lNnmlib\nTARGET=server.bin" >> server.pro && popd
+	pushd dicman && qmake -project && echo -e "LIBS+=-lnunome -lNnmlib\nTARGET=dicman.bin" >> dicman.pro && popd
+	pushd ui && qmake -project -t lib && echo -e "LIBS+=-lNnmlib\nTARGET=nunome" >> ui.pro && popd
+	find . -name "moc*"|xargs rm -f
+	find . -name "Makefile"|xargs rm -f
+}
+
+do_install() {
+	install -d ${D}${palmtopdir}/lib
+	install -d ${D}${palmtopdir}/bin
+	install -d ${D}${palmtopdir}/i18n/ja
+	install -d ${D}${palmtopdir}/share/nunome
+
+	oe_libinstall -so libNnmlib ${D}${palmtopdir}/lib
+        install -m 644 nunome_uni.dic  		${D}${palmtopdir}/share/nunome
+        install -m 755 server/nnmsrv        	${D}${palmtopdir}/bin
+        install -m 755 dicman/nnmDicman		${D}${palmtopdir}/bin
+        install -m 644 ui/nunome.qm		${D}${palmtopdir}/i18n/ja
+        install -m 644 dicman/nnmDicman.qm  	${D}${palmtopdir}/i18n/ja
+}
diff --git a/packages/opie-taskbar/opie-taskbar/htcuniversal/.mtn2git_empty b/packages/opie-taskbar/opie-taskbar/htcuniversal/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/opie-taskbar/opie-taskbar/htcuniversal/.mtn2git_empty
diff --git a/packages/opie-taskbar/opie-taskbar/htcuniversal/opie b/packages/opie-taskbar/opie-taskbar/htcuniversal/opie
new file mode 100644
index 0000000000..fc39fff358
--- /dev/null
+++ b/packages/opie-taskbar/opie-taskbar/htcuniversal/opie
@@ -0,0 +1,82 @@
+#!/bin/sh
+#
+[ -z $LOGNAME ] && export LOGNAME=root && export HOME=/home/root
+[ -z $HOME ] && export HOME=/home/$LOGNAME
+
+export QTDIR=/opt/QtPalmtop
+export OPIEDIR=/opt/QtPalmtop
+export QPEDIR=/opt/QtPalmtop
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$OPIEDIR/lib
+export PATH=$PATH:$OPIEDIR/bin
+export QWS_MOUSE_PROTO=TPanel:`detect-stylus --device`
+export QWS_KEYBOARD=USB:/dev/input/event1
+
+if [ ! -x "$OPIEDIR/bin/qpe" ] ; then 
+    echo Opie not installed
+    exit 0 
+fi
+
+. /etc/profile
+
+for conf in $OPIEDIR/etc/skel/*.conf; do
+	conf_basename=`basename $conf`
+	if [ ! -e "$HOME/Settings/$conf_basename" ] ; then
+		echo "Copying default $conf_basename into $HOME/Settings/"
+		mkdir -p $HOME/Settings/
+		cat $conf >$HOME/Settings/$conf_basename
+	fi
+done
+
+if [ ! -e "$HOME/systeminfo/linkver" ] ; then
+    mkdir -p $HOME/systeminfo/
+    echo "1.13" >$HOME/systeminfo/linkver
+fi
+
+if [ ! -e "/opt/Qtopia" ] ; then
+    ln -sf /opt/QtPalmtop /opt/Qtopia
+fi
+
+case $1 in
+'start')
+    /sbin/getkey 5 "Starting Opie in 5 seconds... press key to interrupt." && exit 0
+    
+    if [ -x "$OPIEDIR/bin/opie-login" ]; then
+            echo Starting Opie-login....
+            $OPIEDIR/bin/opie-login -terminal 2
+    else
+        $OPIEDIR/bin/opie-reorgfiles
+        if [ -x /usr/bin/ssh-agent ]; then
+             SSHAGENT=/usr/bin/ssh-agent
+        else
+             SSHAGENT=""
+        fi
+        
+        if [ -x "$OPIEDIR/bin/opie-sh-ssh-askpass.sh" ]; then
+            export SSH_ASKPASS=$OPIEDIR/bin/opie-sh-ssh-askpass.sh
+        fi           
+        echo Starting Opie....
+        $SSHAGENT $OPIEDIR/bin/qpe -terminal 2
+    fi
+
+    ;;
+
+'stop')
+    echo "Stopping Opie..."
+    killall qpe 2>/dev/null
+    killall opie-login 2>/dev/null
+    killall quicklauncher 2>/dev/null
+
+    ;;
+
+'restart')
+	$0 stop && $0 start
+
+	;;
+
+*)
+    echo "usage: $0 { start | stop | restart }"
+
+    ;;
+
+esac
+
diff --git a/packages/opie-taskbar/opie-taskbar_1.2.1.bb b/packages/opie-taskbar/opie-taskbar_1.2.1.bb
index 1c6f764867..359ea213ec 100644
--- a/packages/opie-taskbar/opie-taskbar_1.2.1.bb
+++ b/packages/opie-taskbar/opie-taskbar_1.2.1.bb
@@ -1,5 +1,5 @@
 include ${PN}.inc
-PR = "r2" 
+PR = "r3"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/calibrate \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/mediummount \
diff --git a/packages/opie-taskbar/opie-taskbar_cvs.bb b/packages/opie-taskbar/opie-taskbar_cvs.bb
index 1fe08a8c1b..f1874cf82a 100644
--- a/packages/opie-taskbar/opie-taskbar_cvs.bb
+++ b/packages/opie-taskbar/opie-taskbar_cvs.bb
@@ -1,6 +1,6 @@
 include ${PN}.inc
 PV = "${OPIE_CVS_PV}"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/calibrate \
            ${HANDHELDS_CVS};module=opie/noncore/settings/mediummount \
diff --git a/packages/python/python-pexpect_0.99.bb b/packages/python/python-pexpect_2.1.bb
index d95eb93f6d..e23aaf5273 100644
--- a/packages/python/python-pexpect_0.99.bb
+++ b/packages/python/python-pexpect_2.1.bb
@@ -6,7 +6,7 @@ LICENSE = "PSF"
 RDEPENDS = "python-core python-io python-terminal python-resource python-fcntl"
 SRCNAME = "pexpect"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/${SRCNAME}/${SRCNAME}-${PV}.tgz"
+SRC_URI = "${SOURCEFORGE_MIRROR}/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit distutils
diff --git a/packages/tinymail/tinymail_svn.bb b/packages/tinymail/tinymail_svn.bb
index a8888f6537..5b7d4c37a1 100644
--- a/packages/tinymail/tinymail_svn.bb
+++ b/packages/tinymail/tinymail_svn.bb
@@ -5,7 +5,9 @@ LICENSE = "GPL"
 MAINTAINER = "Patrick Steiner <patrick.steiner@a1.net>"
 
 PV = "0.0+svn${SRCDATE}"
-PR = "r0"
+PR = "r1"
+
+EXTRA_OECONF=" --disable-gnome --with-platform=gpe --with-html-component=none"
 
 SRC_URI = "svn://svn.cronos.be/svn/tinymail;module=trunk;proto=https \
            file://gtk-doc.m4 \
diff --git a/packages/tslib/tslib/htcuniversal/tslib.sh b/packages/tslib/tslib/htcuniversal/tslib.sh
index 39f3ebab10..c19d3491cb 100644
--- a/packages/tslib/tslib/htcuniversal/tslib.sh
+++ b/packages/tslib/tslib/htcuniversal/tslib.sh
@@ -3,6 +3,3 @@
 TSLIB_TSDEVICE=`detect-stylus --device`
 TSLIB_CONFFILE=/etc/ts.conf
 
-# this one is for making opie happy...
-QWS_MOUSE_PROTO=TPanel:`detect-stylus --device`
-export TSLIB_TSDEVICE TSLIB_CONFFILE QWS_MOUSE_PROTO
diff --git a/packages/tslib/tslib_cvs.bb b/packages/tslib/tslib_cvs.bb
index c96ceab50b..bd3478191e 100644
--- a/packages/tslib/tslib_cvs.bb
+++ b/packages/tslib/tslib_cvs.bb
@@ -1,11 +1,11 @@
 DESCRIPTION = "tslib is a plugin-based flexible touchscreen access library."
 HOMEPAGE = "http://cvs.arm.linux.org.uk/"
-AUTHOR = "Russel King. Plugins by Chris Larson et. al."
+AUTHOR = "Russell King w/ plugins by Chris Larson et. al."
 SECTION = "base"
 LICENSE = "LGPL"
 
 PV = "0.0+cvs${SRCDATE}"
-PR = "r38"
+PR = "r39"
 
 SRC_URI = "cvs://cvs:@pubcvs.arm.linux.org.uk/mnt/src/cvsroot;module=tslib \
            file://usec_fix.patch;patch=1 \
diff --git a/packages/uim/.mtn2git_empty b/packages/uim/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/uim/.mtn2git_empty
diff --git a/packages/uim/files/.mtn2git_empty b/packages/uim/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/uim/files/.mtn2git_empty
diff --git a/packages/uim/files/uim-module-manager.patch b/packages/uim/files/uim-module-manager.patch
new file mode 100644
index 0000000000..8569bf39ef
--- /dev/null
+++ b/packages/uim/files/uim-module-manager.patch
@@ -0,0 +1,11 @@
+--- uim-1.1.0/scm/Makefile.am~	2006-06-09 10:46:12.000000000 +0900
++++ uim-1.1.0/scm/Makefile.am	2006-06-19 23:00:15.620000000 +0900
+@@ -58,7 +58,7 @@
+   module_names += "scim"
+ endif
+ 
+-UIM_MODULE_MANAGER = $(top_builddir)/uim/uim-module-manager
++UIM_MODULE_MANAGER = uim-module-manager
+ UIM_MODULE_MANAGER_ENV = \
+         LIBUIM_SCM_FILES=$(abs_srcdir) \
+         LIBUIM_PLUGIN_LIB_DIR=$(abs_top_builddir)/uim/.libs
diff --git a/packages/uim/uim-native_1.1.0.bb b/packages/uim/uim-native_1.1.0.bb
new file mode 100644
index 0000000000..04c6868bed
--- /dev/null
+++ b/packages/uim/uim-native_1.1.0.bb
@@ -0,0 +1,5 @@
+require uim_${PV}.bb
+DEPENDS = "anthy-native"
+inherit native
+
+SRC_URI = "http://uim.freedesktop.org/releases/uim-${PV}.tar.gz"
diff --git a/packages/uim/uim_1.1.0.bb b/packages/uim/uim_1.1.0.bb
new file mode 100644
index 0000000000..4877e2d86d
--- /dev/null
+++ b/packages/uim/uim_1.1.0.bb
@@ -0,0 +1,98 @@
+DESCRIPTION = "A multilingual user input method library"
+HOMEPAGE = "http://uim.freedesktop.org/"
+LICENSE = "GPL"
+DEPENDS = "uim-native"
+SECTION = "libs/inputmethod"
+PR = "r0"
+
+SRC_URI = "http://uim.freedesktop.org/releases/uim-${PV}.tar.gz \
+	   file://uim-module-manager.patch;patch=1"
+
+S = "${WORKDIR}/uim-${PV}"
+
+inherit autotools pkgconfig
+
+do_stage() {
+	autotools_stage_all
+}
+
+#pkg_postinst_${PN} () {
+#	ldconfig
+#	gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
+#}
+
+PACKAGES = "uim-xim uim-utils uim-skk uim-qt uim-prime uim-m17nlib uim-gtk2.0 uim-fep uim-el uim-common \
+            uim-canna uim-applet-gnome uim-anthy libuim0 libuim-dbg libuim-dev"
+
+DESCRIPTION_uim = "A Japanese input method (backend, dictionary and utility)"
+DESCRIPTION_libuim0 = "uim runtime library"
+DESCRIPTION_libuim-dev = "uim static library, headers and documents for developers"
+
+LEAD_SONAME = "libuim.so.1"
+RDEPENDS_uim = "libuim0"
+
+FILES_libuim-dev = "${libdir}/libuim*.a \
+                    ${libdir}/libuim*.la \
+                    ${libdir}/libuim*.so \
+                    ${includedir}/uim \
+                    ${libdir}/pkgconfig/uim.pc"
+
+FILES_libuim0-dbg = "${libdir}/debug"
+
+
+FILES_libuim0 = "${libdir}/uim/plugin/libuim-custom-enabler.* \
+                 ${libdir}/libuim-custom.so.* \
+#                 ${datadir}/locale/ja/LC_MESSAGES/uim.mo \
+#                 ${datadir}/locale/fr/LC_MESSAGES/uim.mo \
+#                 ${datadir}/locale/ko/LC_MESSAGES/uim.mo \
+                 ${libdir}/libuim.so.*"
+
+
+FILES_uim-anthy = "${libdir}/uim/plugin/libuim-anthy.* \
+                   ${datadir}/uim/anthy*.scm"
+
+FILES_uim-applet-gnome = "${libdir}/bonobo \
+                          ${libdir}/uim/uim-toolbar-applet \
+                          ${datadir}/applications/uim.desktop"
+
+FILES_uim-canna = "${libdir}/uim/plugin/libuim-canna.* \
+                   ${datadir}/uim/canna*.scm"
+
+FILES_uim-el = "${datadir}/emacs \
+                ${bindir}/uim-el-*"
+
+FILES_uim-fep = "${bindir}/uim-fep*"
+
+FILES_uim-gtk2.0 = "${libdir}/gtk-2.0 \
+                    ${bindir}/uim-toolbar-gtk* \
+                    ${bindir}/uim-*-gtk \
+                    ${bindir}/uim-input-pad-ja \
+                    ${datadir}/uim/helperdata/uim-dict-ui.xml"
+
+FILES_uim-m17nlib = "${libdir}/uim/plugin/libuim-m17nlib.* \
+                     ${datadir}/uim/m17nlib.scm"
+
+FILES_uim-prime = "${libdir}/uim/plugin/libuim-prime.* \
+                   ${datadir}/uim/prime*.scm"
+
+
+FILES_uim-qt = "${bindir}/uim-*-qt \
+                ${libdir}/uim/uim-candwin-qt \
+                ${libdir}/qt3/plugins/inputmethods \
+                ${datadir}/locale/ja/LC_MESSAGES/uim-chardict-qt.mo"
+
+FILES_uim-skk = "${libdir}/uim/plugin/libuim-skk.* \
+                 ${datadir}/uim/skk*.scm"
+
+
+FILES_uim-utils = "${bindir}/uim-sh \
+                   ${bindir}/uim-module-manager \
+		   ${libexecdir}/uim-helper-server"
+
+FILES_uim-xim = "${bindir}/uim-xim \
+                 ${libexecdir}/uim-candwin-gtk \
+                 ${datadir}/man/man1/uim-xim.1 \
+                 ${sysconfdir}/X11/xinit/xinput.d/uim*"
+
+FILES_uim-common = "${datadir}/uim/pixmaps/*.png \
+                    ${datadir}/uim"
diff --git a/packages/vnc/tightvnc/Makefile b/packages/vnc/tightvnc/Makefile
index a684e9c987..16420423f2 100644
--- a/packages/vnc/tightvnc/Makefile
+++ b/packages/vnc/tightvnc/Makefile
@@ -18,5 +18,5 @@ vncviewer.c \
 ../libvncauth/d3des.c
 
 tightvncviewer : $(SOURCES)
-	$(CC) $(CFLAGS) $(LDFLAGS) -I. -I../include -I../libvncauth/ -lX11 -lXaw -ljpeg -lz -o tightvncviewer $(SOURCES)
+	$(CC) $(CFLAGS) $(LDFLAGS) -I. -I../include -I../libvncauth/ -lX11 -lXaw6 -ljpeg -lz -o tightvncviewer $(SOURCES)
 
diff --git a/packages/xserver/xserver-kdrive/xcalibrate.patch b/packages/xserver/xserver-kdrive/xcalibrate.patch
new file mode 100644
index 0000000000..3f8cd4ea5c
--- /dev/null
+++ b/packages/xserver/xserver-kdrive/xcalibrate.patch
@@ -0,0 +1,351 @@
+--- xorg-server-X11R7.1-1.1.0/mi/miinitext.c.orig	2006-06-22 14:11:46.000000000 +0200
++++ xorg-server-X11R7.1-1.1.0/mi/miinitext.c	2006-06-22 15:26:17.000000000 +0200
+@@ -385,6 +385,9 @@
+ #ifdef DMXEXT
+ extern void DMXExtensionInit(INITARGS);
+ #endif
++#ifdef XCALIBRATE
++extern void XCalibrateExtensionInit(INITARGS);
++#endif
+ #ifdef XEVIE
+ extern void XevieExtensionInit(INITARGS);
+ #endif
+@@ -679,6 +682,9 @@
+ #ifdef DAMAGE
+     if (!noDamageExtension) DamageExtensionInit();
+ #endif
++#ifdef  XCALIBRATE
++    XCalibrateExtensionInit ();
++#endif
+ }
+ 
+ void
+--- xorg-server-X11R7.1-1.1.0/configure.ac.orig	2006-06-15 17:03:14.000000000 +0200
++++ xorg-server-X11R7.1-1.1.0/configure.ac	2006-06-24 08:21:25.000000000 +0200
+@@ -407,6 +407,7 @@
+ AC_ARG_ENABLE(xf86vidmode,    AS_HELP_STRING([--disable-xf86vidmode], [Build XF86VidMode extension (default: enabled)]), [XF86VIDMODE=$enableval], [XF86VIDMODE=yes])
+ AC_ARG_ENABLE(xf86misc,       AS_HELP_STRING([--disable-xf86misc], [Build XF86Misc extension (default: enabled)]), [XF86MISC=$enableval], [XF86MISC=yes])
+ AC_ARG_ENABLE(xcsecurity,     AS_HELP_STRING([--disable-xcsecurity], [Build Security extension (default: enabled)]), [XCSECURITY=$enableval], [XCSECURITY=yes])
++AC_ARG_ENABLE(xcalibrate,     AS_HELP_STRING([--disable-xcalibrate], [Build XCalibrate extension (default: enabled)]), [XCALIBRATE=$enableval], [XCALIBRATE=yes])
+ AC_ARG_ENABLE(xevie,          AS_HELP_STRING([--disable-xevie], [Build XEvIE extension (default: enabled)]), [XEVIE=$enableval], [XEVIE=yes])
+ AC_ARG_ENABLE(lbx,            AS_HELP_STRING([--disable-lbx], [Build LBX extension (default: no)]), [LBX=$enableval], [LBX=no])
+ AC_ARG_ENABLE(appgroup,       AS_HELP_STRING([--disable-appgroup], [Build XC-APPGROUP extension (default: enabled)]), [APPGROUP=$enableval], [APPGROUP=yes])
+@@ -641,6 +642,12 @@
+ 	AC_DEFINE(XCSECURITY, 1, [Build Security extension])
+ fi
+ 
++AM_CONDITIONAL(XCALIBRATE, [test "x$XCALIBRATE" = xyes])
++if test "x$XCALIBRATE" = xyes; then
++	AC_DEFINE(XCALIBRATE, 1, [Build XCalibrate extension])
++	REQUIRED_MODULES="$REQUIRED_MODULES xcalibrateext"
++fi
++
+ AM_CONDITIONAL(XEVIE, [test "x$XEVIE" = xyes])
+ if test "x$XEVIE" = xyes; then
+ 	AC_DEFINE(XEVIE, 1, [Build XEvIE extension])
+@@ -1466,7 +1473,7 @@
+     KDRIVE_LIB='$(top_builddir)/hw/kdrive/src/libkdrive.a'
+     KDRIVE_OS_LIB='$(top_builddir)/hw/kdrive/linux/liblinux.a'
+     KDRIVE_STUB_LIB='$(top_builddir)/hw/kdrive/src/libkdrivestubs.a'
+-    KDRIVE_LIBS="$DIX_LIB $KDRIVE_LIB $KDRIVE_OS_LIB $KDRIVE_PURE_LIBS $KDRIVE_STUB_LIB"
++    KDRIVE_LIBS="$DIX_LIB $KDRIVE_LIB $KDRIVE_PURE_LIBS $KDRIVE_OS_LIB $KDRIVE_STUB_LIB"
+ 
+     # check if we can build Xephyr
+     PKG_CHECK_MODULES(XEPHYR, x11 xext xfont xau xdmcp, [xephyr="yes"], [xephyr="no"])
+--- xorg-server-X11R7.1-1.1.0/include/kdrive-config.h.in.orig	2006-06-22 14:22:07.000000000 +0200
++++ xorg-server-X11R7.1-1.1.0/include/kdrive-config.h.in	2006-06-22 14:33:29.000000000 +0200
+@@ -22,4 +22,7 @@
+ /* Support tslib touchscreen abstraction library */
+ #undef TSLIB
+ 
++/* Enable XCalibrate extension */
++#undef XCALIBRATE
++
+ #endif /* _KDRIVE_CONFIG_H_ */
+--- xorg-server-X11R7.1-1.1.0/Xext/Makefile.am.orig	2006-06-15 17:06:43.000000000 +0200
++++ xorg-server-X11R7.1-1.1.0/Xext/Makefile.am	2006-06-15 18:12:40.000000000 +0200
+@@ -78,6 +78,11 @@
+ AM_CFLAGS += -DDEFAULTPOLICYFILE=\"$(SERVERCONFIGdir)/SecurityPolicy\"
+ endif
+ 
++XCALIBRATE_SRCS = xcalibrate.c
++if XCALIBRATE
++BUILTIN_SRCS += $(XCALIBRATE_SRCS)
++endif
++
+ # X EVent Interception Extension: allows accessibility helpers & composite
+ # managers to intercept events from input devices and transform as needed
+ # before the clients see them.
+@@ -155,6 +160,7 @@
+ 	$(SCREENSAVER_SRCS) \
+ 	$(XCSECURITY_SRCS) \
+ 	$(XINERAMA_SRCS) \
++	$(XCALIBRATE_SRCS) \
+ 	$(XEVIE_SRCS) \
+ 	$(XPRINT_SRCS) \
+ 	$(APPGROUP_SRCS) \
+--- xorg-server-X11R7.1-1.1.0/Xext/xcalibrate.c.orig	2006-06-15 17:05:19.000000000 +0200
++++ xorg-server-X11R7.1-1.1.0/Xext/xcalibrate.c	2006-06-22 15:15:09.000000000 +0200
+@@ -0,0 +1,262 @@
++/*
++ * $Id: xcalibrate.c,v 3.1 2004/06/02 20:49:50 pb Exp $
++ *
++ * Copyright © 2003 Philip Blundell
++ *
++ * Permission to use, copy, modify, distribute, and sell this software and its
++ * documentation for any purpose is hereby granted without fee, provided that
++ * the above copyright notice appear in all copies and that both that
++ * copyright notice and this permission notice appear in supporting
++ * documentation, and that the name of Philip Blundell not be used in
++ * advertising or publicity pertaining to distribution of the software without
++ * specific, written prior permission.  Philip Blundell makes no
++ * representations about the suitability of this software for any purpose.  It
++ * is provided "as is" without express or implied warranty.
++ *
++ * PHILIP BLUNDELL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
++ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
++ * EVENT SHALL PHILIP BLUNDELL BE LIABLE FOR ANY SPECIAL, INDIRECT OR
++ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
++ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
++ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
++ * PERFORMANCE OF THIS SOFTWARE.
++ */
++
++#ifdef HAVE_KDRIVE_CONFIG_H
++#include <kdrive-config.h>
++#endif
++
++#define NEED_EVENTS
++#define NEED_REPLIES
++
++#include <X11/X.h>
++#include <X11/Xproto.h>
++#include "misc.h"
++#include "os.h"
++#include "dixstruct.h"
++#include "extnsionst.h"
++#include "swaprep.h"
++
++#include <X11/extensions/xcalibrateproto.h>
++#include <X11/extensions/xcalibratewire.h>
++
++extern void (*tslib_raw_event_hook)(int x, int y, int pressure, void *closure);
++extern void *tslib_raw_event_closure;
++
++static CARD8	XCalibrateReqCode;
++int		XCalibrateEventBase;
++int		XCalibrateReqBase;
++int		XCalibrateErrorBase;
++
++static ClientPtr xcalibrate_client;
++
++static void
++xcalibrate_event_hook (int x, int y, int pressure, void *closure)
++{
++  ClientPtr pClient = (ClientPtr) closure;
++  xXCalibrateRawTouchscreenEvent	ev;
++
++  ev.type = XCalibrateEventBase + X_XCalibrateRawTouchscreen;
++  ev.sequenceNumber = pClient->sequence;
++  ev.x = x;
++  ev.y = y;
++  ev.pressure = pressure;
++
++  if (!pClient->clientGone)
++    WriteEventsToClient (pClient, 1, (xEvent *) &ev);
++}
++
++static int
++ProcXCalibrateQueryVersion (ClientPtr client)
++{
++  REQUEST(xXCalibrateQueryVersionReq);
++  xXCalibrateQueryVersionReply rep;
++  CARD16 client_major, client_minor;  /* not used */
++
++  REQUEST_SIZE_MATCH (xXCalibrateQueryVersionReq);
++
++  client_major = stuff->majorVersion;
++  client_minor = stuff->minorVersion;
++
++  fprintf(stderr, "%s(): called\n", __func__); 
++
++  rep.type = X_Reply;
++  rep.length = 0;
++  rep.sequenceNumber = client->sequence;
++  rep.majorVersion = XCALIBRATE_MAJOR_VERSION;
++  rep.minorVersion = XCALIBRATE_MINOR_VERSION;   
++  if (client->swapped) { 
++    int n;
++    swaps(&rep.sequenceNumber, n);
++    swapl(&rep.length, n);     
++    swaps(&rep.majorVersion, n);
++    swaps(&rep.minorVersion, n);
++  }
++  WriteToClient(client, sizeof (xXCalibrateQueryVersionReply), (char *)&rep);
++  return (client->noClientException);
++}
++
++static int
++SProcXCalibrateQueryVersion (ClientPtr client)
++{
++    REQUEST(xXCalibrateQueryVersionReq);
++    int n;
++
++    REQUEST_SIZE_MATCH (xXCalibrateQueryVersionReq);
++    swaps(&stuff->majorVersion,n);
++    swaps(&stuff->minorVersion,n);
++    return ProcXCalibrateQueryVersion(client);
++}
++
++static int
++ProcXCalibrateSetRawMode (ClientPtr client)
++{
++  REQUEST(xXCalibrateRawModeReq);
++  xXCalibrateRawModeReply rep;
++
++  REQUEST_SIZE_MATCH (xXCalibrateRawModeReq);
++
++  memset (&rep, 0, sizeof (rep));
++  rep.type = X_Reply;
++  rep.sequenceNumber = client->sequence;
++
++  if (stuff->on)
++    {
++      if (xcalibrate_client == NULL)
++	{
++	  /* Start calibrating.  */
++	  xcalibrate_client = client;
++	  tslib_raw_event_hook = xcalibrate_event_hook;
++	  tslib_raw_event_closure = client;
++	  rep.status = GrabSuccess;
++	}
++      else
++	{
++	  rep.status = AlreadyGrabbed;
++	}
++    }
++  else
++    {
++      if (xcalibrate_client == client)
++	{
++	  /* Stop calibrating.  */
++	  xcalibrate_client = NULL;
++	  tslib_raw_event_hook = NULL;
++	  tslib_raw_event_closure = NULL;
++	  rep.status = GrabSuccess;
++
++	  /* Cycle input off and on to reload configuration.  */
++	  KdDisableInput ();
++	  KdEnableInput ();
++	}
++      else
++	{
++	  rep.status = AlreadyGrabbed;
++	}
++    }
++
++  if (client->swapped)
++    {
++      int n;
++
++      swaps (&rep.sequenceNumber, n);
++      swaps (&rep.status, n);
++    }
++  WriteToClient(client, sizeof (rep), (char *) &rep);
++  return (client->noClientException);
++}
++
++
++static int
++SProcXCalibrateSetRawMode (ClientPtr client)
++{
++  REQUEST(xXCalibrateRawModeReq);
++  int n;
++
++  REQUEST_SIZE_MATCH (xXCalibrateRawModeReq);
++
++  swaps(&stuff->on, n);
++
++  return ProcXCalibrateSetRawMode(client);
++}
++
++static void
++XCalibrateResetProc (ExtensionEntry *extEntry) 
++{ 
++}
++
++static int
++ProcXCalibrateDispatch (ClientPtr client)
++{
++    REQUEST(xReq);
++    switch (stuff->data) {
++    case X_XCalibrateQueryVersion:
++        return ProcXCalibrateQueryVersion(client);
++    case X_XCalibrateRawMode:
++        return ProcXCalibrateSetRawMode(client);
++    default: break;
++    }
++
++    return BadRequest;
++}
++
++static int
++SProcXCalibrateDispatch (ClientPtr client)
++{
++    REQUEST(xReq);
++    int n;
++
++    swaps(&stuff->length,n);
++
++    switch (stuff->data) {
++    case X_XCalibrateQueryVersion:
++        return SProcXCalibrateQueryVersion(client);
++    case X_XCalibrateRawMode:
++        return SProcXCalibrateSetRawMode(client);
++
++    default: break;
++    }
++
++    return BadRequest;
++}
++
++static void
++XCalibrateClientCallback (CallbackListPtr	*list,
++			  pointer		closure,
++			  pointer		data)
++{
++    NewClientInfoRec	*clientinfo = (NewClientInfoRec *) data;
++    ClientPtr		pClient = clientinfo->client;
++
++    if (clientinfo->setup == NULL
++	&& xcalibrate_client != NULL
++	&& xcalibrate_client == pClient)
++      {
++	/* Stop calibrating.  */
++	xcalibrate_client = NULL;
++	tslib_raw_event_hook = NULL;
++	tslib_raw_event_closure = NULL;
++      }
++}
++
++void
++XCalibrateExtensionInit(void)
++{
++  ExtensionEntry *extEntry;
++
++  if (!AddCallback (&ClientStateCallback, XCalibrateClientCallback, 0))
++    return;  
++
++  extEntry = AddExtension(XCALIBRATE_NAME, XCalibrateNumberEvents, XCalibrateNumberErrors,
++			  ProcXCalibrateDispatch, SProcXCalibrateDispatch,
++			  XCalibrateResetProc, StandardMinorOpcode);
++
++  if (!extEntry)
++    return;
++
++  XCalibrateReqCode = (unsigned char)extEntry->base;
++  XCalibrateEventBase = extEntry->eventBase;
++  XCalibrateErrorBase = extEntry->errorBase;
++
++  xcalibrate_client = 0;
++}
diff --git a/packages/xserver/xserver-kdrive_X11R7.1-1.1.0.bb b/packages/xserver/xserver-kdrive_X11R7.1-1.1.0.bb
index fd7a323eee..103185289c 100644
--- a/packages/xserver/xserver-kdrive_X11R7.1-1.1.0.bb
+++ b/packages/xserver/xserver-kdrive_X11R7.1-1.1.0.bb
@@ -24,7 +24,8 @@ SRC_URI = "http://ftp.x.org/pub/X11R7.1/src/xserver/xorg-server-X11R7.1-1.1.0.ta
 	file://enable-builtin-fonts.patch;patch=1 \
 	file://optional-xkb.patch;patch=1 \
 	file://disable-xf86-dga-xorgcfg.patch;patch=1 \
-	file://enable-tslib.patch;patch=1"
+	file://enable-tslib.patch;patch=1 \
+	file://xcalibrate.patch;patch=1"
 
 SRC_URI_append_mnci   = " file://onlyfb.patch;patch=1"
 SRC_URI_append_poodle = " file://xserver-kdrive-poodle.patch;patch=1"
diff --git a/packages/zroadmap/files/qt2-fixes.patch b/packages/zroadmap/files/qt2-fixes.patch
new file mode 100644
index 0000000000..46b17b8cfb
--- /dev/null
+++ b/packages/zroadmap/files/qt2-fixes.patch
@@ -0,0 +1,25 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- roadmap-1.0.12/src/qt/qt_main.cc~qt2-fixes
++++ roadmap-1.0.12/src/qt/qt_main.cc
+@@ -123,7 +123,7 @@
+       switch (orientation[0]) {
+          case 't':
+          case 'T': break;
+-
++#ifndef QWS
+          case 'b':
+          case 'B': moveDockWindow (toolBar, DockBottom); break;
+ 
+@@ -132,7 +132,7 @@
+ 
+          case 'r':
+          case 'R': moveDockWindow (toolBar, DockRight); break;
+-
++#endif
+          default: roadmap_log (ROADMAP_FATAL,
+                         "Invalid toolbar orientation %s", orientation);
+       }
diff --git a/packages/zroadmap/zroadmap_1.0.8.bb b/packages/zroadmap/zroadmap_1.0.12.bb
index 9c041b2f2d..727a41664b 100644
--- a/packages/zroadmap/zroadmap_1.0.8.bb
+++ b/packages/zroadmap/zroadmap_1.0.12.bb
@@ -7,28 +7,39 @@ direction, speed, etc..). Voice messages are generated that duplicate some of th
 SECTION = "opie/applications"
 PRIORITY = "optional"
 AUTHOR = "Pascal Martin <pascal.martin@iname.com>"
-HOMEPAGE = "http://roadmap.digitalomaha.net/maps.html"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+HOMEPAGE = "http://roadmap.digitalomaha.net/maps.html"
 LICENSE = "GPL"
-PR = "r2"
+PR = "r0"
 
-SRC_URI = "http://roadmap.digitalomaha.net/roadmap/roadmap_1_0_8_src.tar.gz \
+SRC_URI = "http://www.roadmap.digitalomaha.net/roadmap/roadmap_1_0_12p2_src.tar.gz \
+           file://qt2-fixes.patch;pnum=2;patch=1 \
            http://roadmap.digitalomaha.net/maps/usdir.rdm.tgz \
            file://zroadgps.png"
-
-S = "${WORKDIR}/roadmap-${PV}/src/qt"
+S = "${WORKDIR}/roadmap-${PV}/src"
 
 inherit palmtop
 
+QT_LIBRARY = '${@base_conditional("PALMTOP_USE_MULTITHREADED_QT", "yes", "qte-mt", "qte",d)}'
+QT_LIBRARY_append_c7x0 = " -laticore"
+
 EXTRA_OEMAKE = 'DESKTOP=QPE MOC=${OE_QMAKE_MOC} UIC=${OE_QMAKE_UIC} \
-                GUILDFLAGS="-lz -lpng -ljpeg -lts -lqte -lqpe -Wl,-rpath-link,${STAGING_LIBDIR} -L${STAGING_LIBDIR} -L${QTDIR}/lib"'
+                GUICFLAGS="-I${OE_QMAKE_INCDIR_QT} -I${S} -DQWS" \
+                GUILDFLAGS="-lz -lpng -ljpeg -lts -l${QT_LIBRARY} -lqpe -Wl,-rpath-link,${STAGING_LIBDIR} -L${STAGING_LIBDIR} -L${QTDIR}/lib"'
 PARALLEL_MAKE = ""
 
 do_configure() {
-	rm -rf moc*
+	echo removing pregenerated stuff
+	find . -name "moc*"|xargs rm -f
+}
+
+do_compile() {
+	oe_runmake libguiroadmap.a libguiroadgps.a libroadmap.a unix/libosroadmap.a
+	cd qt && oe_runmake
 }
 
 do_install() {
+	cd qt
         install -d ${D}${palmtopdir}/bin
 	install -d ${D}${palmtopdir}/apps/Applications
 	install -d ${D}${palmtopdir}/pics
diff --git a/site/i386-linux b/site/i386-linux
index 6acbf933af..422c825bef 100644
--- a/site/i386-linux
+++ b/site/i386-linux
@@ -82,6 +82,14 @@ ac_cv_func_getaddrinfo=${ac_cv_func_getaddrinfo=yes}
 # D-BUS
 ac_cv_func_posix_getpwnam_r=${ac_cv_func_posix_getpwnam_r=yes}
 
+#ssh
+ac_cv_have_space_d_name_in_struct_dirent=${ac_cv_dirent_have_space_d_name=yes}
+ac_cv_have_broken_snprintf=${ac_cv_have_broken_snprintf=no}
+ac_cv_have_accrights_in_msghdr=${ac_cv_have_accrights_in_msghdr=no}
+ac_cv_have_control_in_msghdr=${ac_cv_have_control_in_msghdr=yes}
+ac_cv_type_struct_timespec=${ac_cv_type_struct_timespec=yes}
+ac_cv_have_openpty_ctty_bug=${ac_cv_have_openpty_ctty_bug=yes}
+
 # samba
 samba_cv_HAVE_GETTIMEOFDAY_TZ=${samba_cv_HAVE_GETTIMEOFDAY_TZ=yes}
 
diff --git a/site/i586-linux b/site/i586-linux
index 3e0023609b..65b7c0dd8a 100644
--- a/site/i586-linux
+++ b/site/i586-linux
@@ -96,6 +96,14 @@ ac_cv_uint=${ac_cv_uint=yes}
 ac_cv_ulong=${ac_cv_ulong=yes}
 ac_cv_ushort=${ac_cv_ushort=yes}
 
+#ssh
+ac_cv_have_space_d_name_in_struct_dirent=${ac_cv_dirent_have_space_d_name=yes}
+ac_cv_have_broken_snprintf=${ac_cv_have_broken_snprintf=no}
+ac_cv_have_accrights_in_msghdr=${ac_cv_have_accrights_in_msghdr=no}
+ac_cv_have_control_in_msghdr=${ac_cv_have_control_in_msghdr=yes}
+ac_cv_type_struct_timespec=${ac_cv_type_struct_timespec=yes}
+ac_cv_have_openpty_ctty_bug=${ac_cv_have_openpty_ctty_bug=yes}
+
 # samba
 samba_cv_HAVE_GETTIMEOFDAY_TZ=${samba_cv_HAVE_GETTIMEOFDAY_TZ=yes}
 
diff --git a/site/mipsel-linux-uclibc b/site/mipsel-linux-uclibc
index cdf6fc5cf3..075b77ee5b 100644
--- a/site/mipsel-linux-uclibc
+++ b/site/mipsel-linux-uclibc
@@ -134,3 +134,6 @@ samba_cv_sysquotas_file=${samba_cv_sysquotas_file=lib/sysquotas_4A.c}
 # This cached value needs a local patch to pick it up, upstream 3.0.14a
 # doesn't cache it.
 samba_cv_LINUX_LFS_SUPPORT=${samba_cv_LINUX_LFS_SUPPORT=yes}
+
+# rp-pppoe
+rpppoe_cv_pack_bitfields=${rpppoe_cv_pack_bitfields=rev}