merge of '0fee5c6e2897d294c4895897736141bed93199a1'

and '113954a10c1eecc2f688fdb881e40dcd951cf598'
author: Philip Balister <philip@balister.org> 2006-08-10 22:43:16 +0000
committer: Philip Balister <philip@balister.org> 2006-08-10 22:43:16 +0000
commit: 4f73c4261ac303c8e0c7cf7fed753a960ae18cc8 (patch)
tree: bbc896465464998401c3decd2f46c940753d3d7f /packages
parent: b0d728d444fca302a14672f02aaf7b9375690b6b (diff)
parent: 3d2bc34ebd06e8bfa612f4ef2e8edc4c758a99c7 (diff)
158 files changed, 2221 insertions, 263 deletions
diff --git a/packages/abiword/abiword_2.4.4.bb b/packages/abiword/abiword_2.4.4.bb
index 8b1ed52d8a..8f6c3adeb6 100644
--- a/packages/abiword/abiword_2.4.4.bb
+++ b/packages/abiword/abiword_2.4.4.bb
@@ -1,6 +1,6 @@
 DESCRIPTION ="AbiWord is free word processing program similar to Microsoft(r) Word""
 HOMEPAGE="http://www.abiword.org""
-MAINTAINER="Koen Kooi <koen@handhelds.org>"
+MAINTAINER="Koen Kooi <koen@linuxtogo.org>"
 LICENSE="GPLv2"
 
 DEPENDS     = "perl-native libgsf libgnomeprint libgnomeprintui libglade libfribidi enchant jpeg libpng perl glibc libxml2"
diff --git a/packages/abiword/abiword_2.4.5.bb b/packages/abiword/abiword_2.4.5.bb
index 8b1ed52d8a..8f6c3adeb6 100644
--- a/packages/abiword/abiword_2.4.5.bb
+++ b/packages/abiword/abiword_2.4.5.bb
@@ -1,6 +1,6 @@
 DESCRIPTION ="AbiWord is free word processing program similar to Microsoft(r) Word""
 HOMEPAGE="http://www.abiword.org""
-MAINTAINER="Koen Kooi <koen@handhelds.org>"
+MAINTAINER="Koen Kooi <koen@linuxtogo.org>"
 LICENSE="GPLv2"
 
 DEPENDS     = "perl-native libgsf libgnomeprint libgnomeprintui libglade libfribidi enchant jpeg libpng perl glibc libxml2"
diff --git a/packages/angstrom/angstrom-version.bb b/packages/angstrom/angstrom-version.bb
index f4322e06f1..34422da237 100644
--- a/packages/angstrom/angstrom-version.bb
+++ b/packages/angstrom/angstrom-version.bb
@@ -1,4 +1,4 @@
-MAINTAINER = "Koen Kooi <koen@handhelds.org>"
+MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 PV = ${DISTRO_VERSION}
 
 do_compile() {
diff --git a/packages/angstrom/task-angstrom.bb b/packages/angstrom/task-angstrom.bb
index 2f1aa23ee8..059e856028 100644
--- a/packages/angstrom/task-angstrom.bb
+++ b/packages/angstrom/task-angstrom.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Task packages for the Angstrom distribution"
-PR = "r15"
+PR = "r16"
 ALLOW_EMPTY = "1"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
@@ -71,7 +71,6 @@ RDEPENDS_angstrom-x11-base-depends := "\
 
 RDEPENDS_angstrom-gpe-task-base := "\
     matchbox \
-    dbus-glib \
     xcursor-transparent-theme \
     rxvt-unicode \
     matchbox-themes-gtk \
diff --git a/packages/bluez/bluez-utils-nodbus_2.25.bb b/packages/bluez/bluez-utils-nodbus_2.25.bb
index bf38140a1b..87068c9ab1 100644
--- a/packages/bluez/bluez-utils-nodbus_2.25.bb
+++ b/packages/bluez/bluez-utils-nodbus_2.25.bb
@@ -1,5 +1,6 @@
 require bluez-utils.inc
 
-PR = "r0"
+PR = "r1"
 
+SRC_URI += " file://hciattach-ti-bts.patch;patch=1"
 EXTRA_OECONF += "--without-dbus"
diff --git a/packages/cairo/cairo_1.2.0.bb b/packages/cairo/cairo_1.2.2.bb
index 700f425113..700f425113 100644
--- a/packages/cairo/cairo_1.2.0.bb
+++ b/packages/cairo/cairo_1.2.2.bb
diff --git a/packages/db/db_4.3.29.bb b/packages/db/db_4.3.29.bb
index 8671efe02a..d17aec5325 100644
--- a/packages/db/db_4.3.29.bb
+++ b/packages/db/db_4.3.29.bb
@@ -14,7 +14,7 @@ HOMEPAGE = "http://www.sleepycat.com"
 LICENSE = "BSD Sleepycat"
 VIRTUAL_NAME ?= "virtual/db"
 CONFLICTS = "db3"
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "http://downloads.sleepycat.com/db-${PV}.tar.gz"
 #SRC_URI_MD5 = "http://downloads.sleepycat.com/db-${PV}.tar.gz.md5"
@@ -52,7 +52,8 @@ FILES_${PN}-bin = "${bindir}"
 FILES_${PN}-dev = "${includedir} ${libdir}"
 
 #configuration - set in local.conf to override
-DB4_CONFIG ?= "--enable-o_direct --enable-smallbuild --enable-compat185"
+# All the --disable-* options replace --enable-smallbuild, which breaks a bunch of stuff (eg. postfix)
+DB4_CONFIG ?= "--enable-o_direct --disable-cryptography --disable-queue --disable-replication --disable-statistics --disable-verify --enable-compat185"
 EXTRA_OECONF = "${DB4_CONFIG}"
 
 # Override the MUTEX setting here, the POSIX library is
diff --git a/packages/dbus/dbus_0.20.bb b/packages/dbus/dbus_0.20.bb
index 0a08862f10..6d0a777fef 100644
--- a/packages/dbus/dbus_0.20.bb
+++ b/packages/dbus/dbus_0.20.bb
@@ -2,6 +2,7 @@ SECTION = "base"
 HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
 DESCRIPTION = "message bus system for applications to talk to one another"
 DEPENDS = "expat glib-2.0 virtual/libintl"
+PROVIDES = "dbus-glib"
 LICENSE = "GPL"
 
 SRC_URI = "http://freedesktop.org/Software/dbus/releases/dbus-${PV}.tar.gz \
diff --git a/packages/dbus/dbus_0.21.bb b/packages/dbus/dbus_0.21.bb
index abd234712f..d7b164e8cc 100644
--- a/packages/dbus/dbus_0.21.bb
+++ b/packages/dbus/dbus_0.21.bb
@@ -3,6 +3,7 @@ PR = "r4"
 HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
 DESCRIPTION = "message bus system for applications to talk to one another"
 DEPENDS = "expat glib-2.0 virtual/libintl"
+PROVIDES = "dbus-glib"
 LICENSE = "GPL"
 
 SRC_URI = "http://freedesktop.org/Software/dbus/releases/dbus-${PV}.tar.gz \
diff --git a/packages/dbus/dbus_0.22.bb b/packages/dbus/dbus_0.22.bb
index 424c27908b..8eacbeca27 100644
--- a/packages/dbus/dbus_0.22.bb
+++ b/packages/dbus/dbus_0.22.bb
@@ -4,6 +4,7 @@ HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
 DESCRIPTION = "message bus system for applications to talk to one another"
 LICENSE = "GPL"
 DEPENDS = "expat glib-2.0 virtual/libintl"
+PROVIDES = "dbus-glib"
 
 SRC_URI = "http://freedesktop.org/software/dbus/releases/dbus-${PV}.tar.gz \
 	   file://cross.patch;patch=1 \
diff --git a/packages/dbus/dbus_0.23.1-osso5.bb b/packages/dbus/dbus_0.23.1-osso5.bb
index b2fc9c44ac..1cb72cb792 100644
--- a/packages/dbus/dbus_0.23.1-osso5.bb
+++ b/packages/dbus/dbus_0.23.1-osso5.bb
@@ -5,6 +5,7 @@ HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
 DESCRIPTION = "message bus system for applications to talk to one another"
 LICENSE = "GPL"
 DEPENDS = "expat glib-2.0 virtual/libintl"
+PROVIDES = "dbus-glib"
 
 SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/d/${PN}/${PN}_${PV}.tar.gz \
 	   file://cross.patch;patch=1 \
diff --git a/packages/dbus/dbus_0.23.4.bb b/packages/dbus/dbus_0.23.4.bb
index dc3f6f2e72..6fd86ae1aa 100644
--- a/packages/dbus/dbus_0.23.4.bb
+++ b/packages/dbus/dbus_0.23.4.bb
@@ -4,6 +4,7 @@ HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
 DESCRIPTION = "message bus system for applications to talk to one another"
 LICENSE = "GPL"
 DEPENDS = "expat glib-2.0 virtual/libintl"
+PROVIDES = "dbus-glib"
 
 SRC_URI = "http://freedesktop.org/software/dbus/releases/dbus-${PV}.tar.gz \
 	   file://cross.patch;patch=1 \
diff --git a/packages/dbus/dbus_0.23.bb b/packages/dbus/dbus_0.23.bb
index c0faeec1a6..de224f307e 100644
--- a/packages/dbus/dbus_0.23.bb
+++ b/packages/dbus/dbus_0.23.bb
@@ -4,6 +4,7 @@ HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
 DESCRIPTION = "message bus system for applications to talk to one another"
 LICENSE = "GPL"
 DEPENDS = "expat glib-2.0 virtual/libintl"
+PROVIDES = "dbus-glib"
 
 SRC_URI = "http://freedesktop.org/software/dbus/releases/dbus-${PV}.tar.gz \
 	   file://cross.patch;patch=1 \
diff --git a/packages/dbus/dbus_0.60.bb b/packages/dbus/dbus_0.60.bb
index 2d9a27e74d..57a1c10242 100644
--- a/packages/dbus/dbus_0.60.bb
+++ b/packages/dbus/dbus_0.60.bb
@@ -2,6 +2,7 @@ require dbus_${PV}.inc
 
 FILESPATH = "${FILE_DIRNAME}/dbus-0.6x:${FILE_DIRNAME}/dbus"
 DEPENDS = "expat glib-2.0 virtual/libintl dbus-native"
+PROVIDES = "dbus-glib"
 SRC_URI_EXTRA = "file://no-introspect.patch;patch=1 file://no-bindings.patch;patch=1"
 
 FILES_${PN} += "${bindir}/dbus-daemon"
diff --git a/packages/dbus/dbus_0.61.bb b/packages/dbus/dbus_0.61.bb
index 2d9a27e74d..57a1c10242 100644
--- a/packages/dbus/dbus_0.61.bb
+++ b/packages/dbus/dbus_0.61.bb
@@ -2,6 +2,7 @@ require dbus_${PV}.inc
 
 FILESPATH = "${FILE_DIRNAME}/dbus-0.6x:${FILE_DIRNAME}/dbus"
 DEPENDS = "expat glib-2.0 virtual/libintl dbus-native"
+PROVIDES = "dbus-glib"
 SRC_URI_EXTRA = "file://no-introspect.patch;patch=1 file://no-bindings.patch;patch=1"
 
 FILES_${PN} += "${bindir}/dbus-daemon"
diff --git a/packages/dbus/dbus_0.62.bb b/packages/dbus/dbus_0.62.bb
index 2d9a27e74d..57a1c10242 100644
--- a/packages/dbus/dbus_0.62.bb
+++ b/packages/dbus/dbus_0.62.bb
@@ -2,6 +2,7 @@ require dbus_${PV}.inc
 
 FILESPATH = "${FILE_DIRNAME}/dbus-0.6x:${FILE_DIRNAME}/dbus"
 DEPENDS = "expat glib-2.0 virtual/libintl dbus-native"
+PROVIDES = "dbus-glib"
 SRC_URI_EXTRA = "file://no-introspect.patch;patch=1 file://no-bindings.patch;patch=1"
 
 FILES_${PN} += "${bindir}/dbus-daemon"
diff --git a/packages/devmem2/devmem2.bb b/packages/devmem2/devmem2.bb
index 0ddaec5637..64de9fcbf3 100644
--- a/packages/devmem2/devmem2.bb
+++ b/packages/devmem2/devmem2.bb
@@ -1,4 +1,4 @@
-SRC_URI = "http://www.lart.tudelft.nl/lartware/port/devmem2.c"
+SRC_URI = "http://www.abcsinc.com/small-linux/devmem2.c"
 LICENSE = "GPL"
 
 S = "${WORKDIR}"
diff --git a/packages/dia/dia_0.94+0.95pre3.bb b/packages/dia/dia_0.94+0.95pre3.bb
index 41366a335b..2905a598ce 100644
--- a/packages/dia/dia_0.94+0.95pre3.bb
+++ b/packages/dia/dia_0.94+0.95pre3.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Dia is a gtk+ based diagram creation program released under the GPL license."
 LICENSE = "GPL"
 DEPENDS = "libart-lgpl libpng cairo zlib gtk+ libxml2"
-MAINTAINER = "Koen Kooi <koen@handhelds.org>"
+MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 PR = "r1"
 
 inherit autotools pkgconfig
diff --git a/packages/eel/eel_2.12.2.bb b/packages/eel/eel_2.12.2.bb
index e10fde14e8..92bfc88f46 100644
--- a/packages/eel/eel_2.12.2.bb
+++ b/packages/eel/eel_2.12.2.bb
@@ -7,7 +7,7 @@ inherit gnome
 LICENSE="GPL"
 SRC_URI += "file://configure.patch;patch=1"
 
-DEPENDS = "gnome-vfs gnome-menus libgnomeui gail"
+DEPENDS = "gnome-vfs gnome-desktop gnome-menus libgnomeui gail"
 EXTRA_OECONF = "--disable-gtk-doc"
 
 
diff --git a/packages/fakeroot/fakeroot_1.2.13.bb b/packages/fakeroot/fakeroot_1.2.13.bb
index 8ae7ca38be..6867a39c93 100644
--- a/packages/fakeroot/fakeroot_1.2.13.bb
+++ b/packages/fakeroot/fakeroot_1.2.13.bb
@@ -6,3 +6,9 @@ LICENSE = "GPL"
 SRC_URI = "http://openzaurus.org/mirror/fakeroot_${PV}.tar.gz"
 
 inherit autotools
+
+do_stage() {
+	install -d ${STAGING_INCDIR}/fakeroot
+	install -m 644 *.h ${STAGING_INCDIR}/fakeroot
+	autotools_stage_all
+}
diff --git a/packages/familiar/familiar-version.bb b/packages/familiar/familiar-version.bb
index cd25f7f78e..20d94dbf1c 100644
--- a/packages/familiar/familiar-version.bb
+++ b/packages/familiar/familiar-version.bb
@@ -1,4 +1,4 @@
-MAINTAINER = "Koen Kooi <koen@handhelds.org>"
+MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 PV = ${DISTRO_VERSION}
 
 do_compile() {
diff --git a/packages/farsight/farsight_20060322.bb b/packages/farsight/farsight_0.1.5.bb
index 994569ac57..ee176dcacd 100644
--- a/packages/farsight/farsight_20060322.bb
+++ b/packages/farsight/farsight_0.1.5.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "FarSight is an audio/video conferencing framework specifically designed for Instant Messengers."
 HOMEPAGE = "http://farsight.sf.net"
-SRC_URI = "http://ewi546.ewi.utwente.nl/OE/source/${PN}_${PV}.tar.bz2"
-PR="r1"
+SRC_URI = "http://telepathy.freedesktop.org/releases/farsight/${P}.tar.gz"
 
 MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>"
 
@@ -9,7 +8,6 @@ DEPENDS = "glib-2.0 libxml2 zlib dbus libjingle gstreamer gst-plugins-base"
 
 inherit autotools pkgconfig
 
-S=  "${WORKDIR}/${PN}"
 EXTRA_OECONF = " \
 --disable-debug \
   --disable-gtk-doc \
diff --git a/packages/farsight/gst-plugins-farsight_20060322.bb b/packages/farsight/gst-plugins-farsight_0.10.1.bb
index 49f2d2a1f5..5fb44e07c2 100644
--- a/packages/farsight/gst-plugins-farsight_20060322.bb
+++ b/packages/farsight/gst-plugins-farsight_0.10.1.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "FarSight is an audio/video conferencing framework specifically designed for Instant Messengers."
 HOMEPAGE = "http://farsight.sf.net"
-SRC_URI = "http://ewi546.ewi.utwente.nl/OE/source/${PN}_${PV}.tar.bz2"
+SRC_URI = "http://telepathy.freedesktop.org/releases/gst-plugins-farsight/${P}.tar.gz"
 
 MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>"
 
@@ -8,7 +8,6 @@ DEPENDS = "glib-2.0 libxml2 zlib dbus libjingle gstreamer gst-plugins-base"
 
 inherit autotools pkgconfig
 
-S=  "${WORKDIR}/${PN}"
 EXTRA_OECONF = " \
 --disable-debug \
    --disable-jrtplib \
diff --git a/packages/fuse/fuse-module_2.4.2.bb b/packages/fuse/fuse-module_2.4.2.bb
index 8b8ca91eef..512f0453a1 100644
--- a/packages/fuse/fuse-module_2.4.2.bb
+++ b/packages/fuse/fuse-module_2.4.2.bb
@@ -1,6 +1,6 @@
 HOMEPAGE = "http://fuse.sf.net"
 DESCRIPTION = "With FUSE it is possible to implement a fully functional filesystem in a userspace program"
-MAINTAINER = "Koen Kooi <koen@handhelds.org>"
+MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 
 LICENSE = "GPL"
 
diff --git a/packages/fuse/fuse-module_2.5.3.bb b/packages/fuse/fuse-module_2.5.3.bb
index ae52ad0b03..94cd87c603 100644
--- a/packages/fuse/fuse-module_2.5.3.bb
+++ b/packages/fuse/fuse-module_2.5.3.bb
@@ -1,6 +1,6 @@
 HOMEPAGE = "http://fuse.sf.net"
 DESCRIPTION = "With FUSE it is possible to implement a fully functional filesystem in a userspace program"
-MAINTAINER = "Koen Kooi <koen@handhelds.org>"
+MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 
 LICENSE = "GPL"
 
diff --git a/packages/fuse/fuse_2.4.2.bb b/packages/fuse/fuse_2.4.2.bb
index 27abd3a898..a51c659153 100644
--- a/packages/fuse/fuse_2.4.2.bb
+++ b/packages/fuse/fuse_2.4.2.bb
@@ -1,6 +1,6 @@
 HOMEPAGE = "http://fuse.sf.net"
 DESCRIPTION = "With FUSE it is possible to implement a fully functional filesystem in a userspace program"
-MAINTAINER = "Koen Kooi <koen@handhelds.org>"
+MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 
 LICENSE_${PN} = "LGPL"
 
diff --git a/packages/fuse/fuse_2.5.3.bb b/packages/fuse/fuse_2.5.3.bb
index 229b38f2d7..8aa1f3578d 100644
--- a/packages/fuse/fuse_2.5.3.bb
+++ b/packages/fuse/fuse_2.5.3.bb
@@ -1,6 +1,6 @@
 HOMEPAGE = "http://fuse.sf.net"
 DESCRIPTION = "With FUSE it is possible to implement a fully functional filesystem in a userspace program"
-MAINTAINER = "Koen Kooi <koen@handhelds.org>"
+MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 
 LICENSE_${PN} = "LGPL"
 
diff --git a/packages/fuse/gmailfs_0.6.bb b/packages/fuse/gmailfs_0.6.bb
index fbac857024..169b42d1f3 100644
--- a/packages/fuse/gmailfs_0.6.bb
+++ b/packages/fuse/gmailfs_0.6.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "GmailFS provides a mountable Linux filesystem which uses your Gmail account as its storage medium."
 HOMEPAGE = "http://richard.jones.name/google-hacks/gmail-filesystem/gmail-filesystem.html"
-MAINTAINER = "koen Kooi <koen@handhelds.org>"
+MAINTAINER = "koen Kooi <koen@linuxtogo.org>"
 LICENSE = "GPL"
 
 DEPENDS = "fuse libgmail python-fuse"
diff --git a/packages/fuse/sshfs-fuse_1.3.bb b/packages/fuse/sshfs-fuse_1.3.bb
index d147d829b3..70c502be82 100644
--- a/packages/fuse/sshfs-fuse_1.3.bb
+++ b/packages/fuse/sshfs-fuse_1.3.bb
@@ -1,6 +1,6 @@
 HOMEPAGE = "http://fuse.sourceforge.net/sshfs.html"
 DESCRIPTION = "This is a filesystem client based on the SSH File Transfer Protocol using FUSE."
-MAINTAINER = "Koen Kooi <koen@handhelds.org>"
+MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 
 LICENSE_${PN} = "LGPL"
 
diff --git a/packages/galago/galago-daemon_0.3.4.bb b/packages/galago/galago-daemon_0.3.4.bb
index 22257b6f44..508c8c9323 100644
--- a/packages/galago/galago-daemon_0.3.4.bb
+++ b/packages/galago/galago-daemon_0.3.4.bb
@@ -1,6 +1,6 @@
 DESCRIPTION =   "Galago is a desktop presence framework, designed to transmit presence information between programs."
 HOMEPAGE =      "http://www.galago-project.org/"
-MAINTAINER =    "Koen Kooi <koen@handhelds.org>"
+MAINTAINER =    "Koen Kooi <koen@linuxtogo.org>"
 LICENSE =       "GPL"
 DEPENDS =       "gettext libgalago dbus glib-2.0"
 PR = "r1"
diff --git a/packages/galago/libgalago_0.3.3.bb b/packages/galago/libgalago_0.3.3.bb
index 85f4097806..63a0b8230a 100644
--- a/packages/galago/libgalago_0.3.3.bb
+++ b/packages/galago/libgalago_0.3.3.bb
@@ -1,6 +1,6 @@
 DESCRIPTION =	"Galago is a desktop presence framework, designed to transmit presence information between programs."
 HOMEPAGE =	"http://www.galago-project.org/"
-MAINTAINER =	"Koen Kooi <koen@handhelds.org>"
+MAINTAINER =	"Koen Kooi <koen@linuxtogo.org>"
 LICENSE =	"LGPL"
 DEPENDS = 	"gettext dbus glib-2.0"
 PR =		"r1"
diff --git a/packages/geda/geda-gattrib_20050820.bb b/packages/geda/geda-gattrib_20050820.bb
index 3267330764..fa73a2454a 100644
--- a/packages/geda/geda-gattrib_20050820.bb
+++ b/packages/geda/geda-gattrib_20050820.bb
@@ -1,4 +1,4 @@
-MAINTAINER = "Koen Kooi <koen@handhelds.org>"
+MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 LICENSE = "GPLv2"
 HOMEPAGE = "http://geda.seul.org"
 FILES_${PN} += "${datadir}/gEDA"
diff --git a/packages/geda/geda-gnetlist_20050820.bb b/packages/geda/geda-gnetlist_20050820.bb
index aec9007906..402ad0f56a 100644
--- a/packages/geda/geda-gnetlist_20050820.bb
+++ b/packages/geda/geda-gnetlist_20050820.bb
@@ -1,4 +1,4 @@
-MAINTAINER = "Koen Kooi <koen@handhelds.org>"
+MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 LICENSE = "GPLv2"
 HOMEPAGE = "http://geda.seul.org"
 PR = "r0"
diff --git a/packages/geda/geda-gschem_20050820.bb b/packages/geda/geda-gschem_20050820.bb
index 984e04e520..441acbd2d6 100644
--- a/packages/geda/geda-gschem_20050820.bb
+++ b/packages/geda/geda-gschem_20050820.bb
@@ -1,4 +1,4 @@
-MAINTAINER = "Koen Kooi <koen@handhelds.org>"
+MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 LICENSE = "GPLv2"
 HOMEPAGE = "http://geda.seul.org"
 PR = "r1"
diff --git a/packages/geda/geda-gsymcheck_20050820.bb b/packages/geda/geda-gsymcheck_20050820.bb
index aec9007906..402ad0f56a 100644
--- a/packages/geda/geda-gsymcheck_20050820.bb
+++ b/packages/geda/geda-gsymcheck_20050820.bb
@@ -1,4 +1,4 @@
-MAINTAINER = "Koen Kooi <koen@handhelds.org>"
+MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 LICENSE = "GPLv2"
 HOMEPAGE = "http://geda.seul.org"
 PR = "r0"
diff --git a/packages/geda/geda-symbols_20050820.bb b/packages/geda/geda-symbols_20050820.bb
index aec9007906..402ad0f56a 100644
--- a/packages/geda/geda-symbols_20050820.bb
+++ b/packages/geda/geda-symbols_20050820.bb
@@ -1,4 +1,4 @@
-MAINTAINER = "Koen Kooi <koen@handhelds.org>"
+MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 LICENSE = "GPLv2"
 HOMEPAGE = "http://geda.seul.org"
 PR = "r0"
diff --git a/packages/geda/geda-utils_20050820.bb b/packages/geda/geda-utils_20050820.bb
index 27092492fe..a7a4d84826 100644
--- a/packages/geda/geda-utils_20050820.bb
+++ b/packages/geda/geda-utils_20050820.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "gEDA/gaf's Utilities"
-MAINTAINER = "Koen Kooi <koen@handhelds.org>"
+MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 LICENSE = "GPLv2"
 HOMEPAGE = "http://geda.seul.org"
 FILES_${PN} += "${datadir}/gEDA"
diff --git a/packages/geda/geda_20050820.bb b/packages/geda/geda_20050820.bb
index 84918d63b2..77a2765512 100644
--- a/packages/geda/geda_20050820.bb
+++ b/packages/geda/geda_20050820.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "GUI/Project Manager for teh gEDA suite"
-MAINTAINER = "Koen Kooi <koen@handhelds.org>"
+MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 LICENSE = "GPLv2"
 HOMEPAGE = "http://geda.seul.org"
 FILES_${PN} += "${datadir}/gEDA"
diff --git a/packages/geda/libgeda_20050820.bb b/packages/geda/libgeda_20050820.bb
index 8bc1c7cd1a..8e8046ccef 100644
--- a/packages/geda/libgeda_20050820.bb
+++ b/packages/geda/libgeda_20050820.bb
@@ -1,4 +1,4 @@
-MAINTAINER = "Koen Kooi <koen@handhelds.org>"
+MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 LICENSE = "GPLv2"
 HOMEPAGE = "http://geda.seul.org"
 PR = "r1"
diff --git a/packages/gimp/gimp_2.2.10.bb b/packages/gimp/gimp_2.2.10.bb
index 59fb0a0467..8a9c52a1ce 100644
--- a/packages/gimp/gimp_2.2.10.bb
+++ b/packages/gimp/gimp_2.2.10.bb
@@ -1,7 +1,7 @@
 DESCRIPTION =	"The GIMP is the GNU Image Manipulation Program."
 HOMEPAGE = 	"http://www.gimp.org"
 LICENSE =	"GPL"
-MAINTAINER =	"Koen Kooi <koen@handhelds.org>"
+MAINTAINER =	"Koen Kooi <koen@linuxtogo.org>"
 
 SRC_URI =	"ftp://ftp.gimp.org/pub/gimp/v2.2/gimp-${PV}.tar.bz2"
 
diff --git a/packages/gimp/gimp_2.3.10.bb b/packages/gimp/gimp_2.3.10.bb
index e469f3c101..eb760ec9d8 100644
--- a/packages/gimp/gimp_2.3.10.bb
+++ b/packages/gimp/gimp_2.3.10.bb
@@ -1,7 +1,7 @@
 DESCRIPTION =	"The GIMP is the GNU Image Manipulation Program."
 HOMEPAGE = 	"http://www.gimp.org"
 LICENSE =	"GPL"
-MAINTAINER =	"Koen Kooi <koen@handhelds.org>"
+MAINTAINER =	"Koen Kooi <koen@linuxtogo.org>"
 
 SRC_URI =	"ftp://ftp.gimp.org/pub/gimp/v2.3/gimp-${PV}.tar.bz2 \
                  file://configure-libwmf.patch;patch=1"
diff --git a/packages/gimp/gimp_2.3.7.bb b/packages/gimp/gimp_2.3.7.bb
index 89d9be3e8d..cca90f5355 100644
--- a/packages/gimp/gimp_2.3.7.bb
+++ b/packages/gimp/gimp_2.3.7.bb
@@ -1,7 +1,7 @@
 DESCRIPTION =	"The GIMP is the GNU Image Manipulation Program."
 HOMEPAGE = 	"http://www.gimp.org"
 LICENSE =	"GPL"
-MAINTAINER =	"Koen Kooi <koen@handhelds.org>"
+MAINTAINER =	"Koen Kooi <koen@linuxtogo.org>"
 
 SRC_URI =	"ftp://ftp.gimp.org/pub/gimp/v2.3/gimp-${PV}.tar.bz2"
 
diff --git a/packages/gimp/gimp_2.3.8.bb b/packages/gimp/gimp_2.3.8.bb
index 84b35b1e8d..af1b91d03b 100644
--- a/packages/gimp/gimp_2.3.8.bb
+++ b/packages/gimp/gimp_2.3.8.bb
@@ -1,7 +1,7 @@
 DESCRIPTION =	"The GIMP is the GNU Image Manipulation Program."
 HOMEPAGE = 	"http://www.gimp.org"
 LICENSE =	"GPL"
-MAINTAINER =	"Koen Kooi <koen@handhelds.org>"
+MAINTAINER =	"Koen Kooi <koen@linuxtogo.org>"
 
 SRC_URI =	"ftp://ftp.gimp.org/pub/gimp/v2.3/gimp-${PV}.tar.bz2 \
                  file://configure-libwmf.patch;patch=1"
diff --git a/packages/gnome/gnome-menus_2.10.2.bb b/packages/gnome/gnome-menus_2.10.2.bb
index 9d7bc675f2..53b66a6e9b 100644
--- a/packages/gnome/gnome-menus_2.10.2.bb
+++ b/packages/gnome/gnome-menus_2.10.2.bb
@@ -1,7 +1,7 @@
 DEPENDS = "gnome-vfs libxml2 gconf popt gtk+"
 LICENSE = "GPL"
 
-MAINTAINER = "Koen Kooi <koen@handhelds.org>"
+MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 
 inherit gnome pkgconfig
 
diff --git a/packages/gnome/gnome-menus_2.12.0.bb b/packages/gnome/gnome-menus_2.12.0.bb
index 87f5a0d2b9..ff65f1f9ad 100644
--- a/packages/gnome/gnome-menus_2.12.0.bb
+++ b/packages/gnome/gnome-menus_2.12.0.bb
@@ -1,7 +1,7 @@
 DEPENDS = "python gnome-vfs libxml2 gconf popt gtk+"
 LICENSE = "GPL"
 
-MAINTAINER = "Koen Kooi <koen@handhelds.org>"
+MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 
 inherit gnome pkgconfig
 
diff --git a/packages/gnome/gnome-panel_2.10.1.bb b/packages/gnome/gnome-panel_2.10.1.bb
index 09e4259fc8..3d7ce2f392 100644
--- a/packages/gnome/gnome-panel_2.10.1.bb
+++ b/packages/gnome/gnome-panel_2.10.1.bb
@@ -1,5 +1,5 @@
 LICENSE = "GPL"
-MAINTAINER = "Koen Kooi <koen@handhelds.org>"
+MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 DEPENDS = "libwnck orbit2 gtk+ libgnome libgnomeui gnome-desktop libglade gnome-menus"
 
 inherit gnome pkgconfig
diff --git a/packages/gnome/gnome-vfs-dbus/dbus-api-change.patch b/packages/gnome/gnome-vfs-dbus/dbus-api-change.patch
new file mode 100644
index 0000000000..38480c21e1
--- /dev/null
+++ b/packages/gnome/gnome-vfs-dbus/dbus-api-change.patch
@@ -0,0 +1,78 @@
+--- trunk/dbus-daemon/vfs-daemon.c.orig	2006-08-09 10:43:26.000000000 +0100
++++ trunk/dbus-daemon/vfs-daemon.c	2006-08-09 10:45:59.000000000 +0100
+@@ -91,7 +91,7 @@
+ 		g_warning ("Failed to acquire vfs-daemon service: %s", error.message);
+ 		dbus_error_free (&error);
+ 
+-		dbus_connection_disconnect (conn);
++		dbus_connection_close (conn);
+ 		dbus_connection_unref (conn);
+ 		conn = NULL;
+ 
+@@ -101,7 +101,7 @@
+ 	if (ret == DBUS_REQUEST_NAME_REPLY_EXISTS) {
+ 		g_printerr ("VFS daemon already running, exiting.\n");
+ 
+-		dbus_connection_disconnect (conn);
++		dbus_connection_close (conn);
+ 		dbus_connection_unref (conn);
+ 		conn = NULL;
+ 
+@@ -111,7 +111,7 @@
+ 	if (ret != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) {
+ 		g_printerr ("Not primary owner of the service, exiting.\n");
+ 
+-		dbus_connection_disconnect (conn);
++		dbus_connection_close (conn);
+ 		dbus_connection_unref (conn);
+ 		conn = NULL;
+ 
+@@ -124,7 +124,7 @@
+ 						   NULL)) {
+ 		g_printerr ("Failed to register object with D-BUS.\n");
+ 
+-		dbus_connection_disconnect (conn);
++		dbus_connection_close (conn);
+ 		dbus_connection_unref (conn);
+ 		conn = NULL;
+ 
+@@ -152,7 +152,7 @@
+ 		return;
+ 	}
+ 
+-	dbus_connection_disconnect (conn);
++	dbus_connection_close (conn);
+ 	dbus_connection_unref (conn);
+ }
+ 
+--- trunk/dbus-daemon/daemon-connection.c.orig	2006-08-09 10:43:32.000000000 +0100
++++ trunk/dbus-daemon/daemon-connection.c	2006-08-09 10:46:26.000000000 +0100
+@@ -321,7 +321,7 @@
+ 	d(g_print ("Last unref\n"));
+ 
+ 	if (dbus_connection_get_is_connected (conn->conn)) {
+-		dbus_connection_disconnect (conn->conn);
++		dbus_connection_close (conn->conn);
+ 	}
+ 	dbus_connection_unref (conn->conn);
+ 
+--- trunk/dbus-daemon/dbus-method.c.orig	2006-08-09 10:43:38.000000000 +0100
++++ trunk/dbus-daemon/dbus-method.c	2006-08-09 10:46:57.000000000 +0100
+@@ -220,7 +220,7 @@
+ 	if (!dbus_connection_add_filter (dbus_conn, message_handler,
+ 					 NULL, NULL)) {
+ 		g_warning ("Failed to add filter to the connection.");
+-		dbus_connection_disconnect (dbus_conn);
++		dbus_connection_close (dbus_conn);
+ 		dbus_connection_unref (dbus_conn);
+ 
+ 		dbus_conn = NULL;
+@@ -1666,7 +1666,7 @@
+ vfs_module_shutdown (GnomeVFSMethod* method)
+ {
+ 	if (dbus_conn) {
+-		dbus_connection_disconnect (dbus_conn);
++		dbus_connection_close (dbus_conn);
+ 		dbus_connection_unref (dbus_conn);
+ 
+ 		dbus_conn = NULL;
diff --git a/packages/gnome/gnome-vfs-dbus_svn.bb b/packages/gnome/gnome-vfs-dbus_svn.bb
index 466d52adbe..7a48fb6ca3 100644
--- a/packages/gnome/gnome-vfs-dbus_svn.bb
+++ b/packages/gnome/gnome-vfs-dbus_svn.bb
@@ -18,7 +18,8 @@ SRC_URI = "svn://developer.imendio.com/svn/gnome-vfs-dbus;module=trunk;proto=htt
            file://glib-after-nameser.patch;patch=1;pnum=1 \
 	   file://gtk-doc.m4 \
 	   file://gtk-doc.make \
-	   file://werror_compile.patch;patch=1;pnum=1"
+	   file://werror_compile.patch;patch=1;pnum=1 \
+	   file://dbus-api-change.patch;patch=1"
 
 EXTRA_OECONF = "--with-ipc=dbus --disable-gtk-doc"
 S = "${WORKDIR}/trunk"
diff --git a/packages/gnumeric/gnumeric_1.6.3.bb b/packages/gnumeric/gnumeric_1.6.3.bb
index 0fc45bbd63..7fa400e6d8 100644
--- a/packages/gnumeric/gnumeric_1.6.3.bb
+++ b/packages/gnumeric/gnumeric_1.6.3.bb
@@ -1,7 +1,7 @@
 LICENSE = "GPL"
 SECTION = "x11/utils"
 S = "${WORKDIR}/gnumeric-${PV}"
-MAINTAINER = "Koen Kooi <koen@handhelds.org>"
+MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 DEPENDS = "libgsf gtk+ libxml2 goffice libglade libart-lgpl intltool-native libgnomecanvas libgnomeprint libgnomeprintui libbonoboui"
 DESCRIPTION = "Gnumeric spreadsheet for GNOME"
 
diff --git a/packages/gobby/net6_1.2.2.bb b/packages/gobby/net6_1.2.2.bb
index c6197ace0a..daa7e9b5b9 100644
--- a/packages/gobby/net6_1.2.2.bb
+++ b/packages/gobby/net6_1.2.2.bb
@@ -1,6 +1,6 @@
 LICENSE = "LGPL"
 HOMEPAGE = "http://darcs.0x539.de/trac/obby/cgi-bin/trac.cgi/wiki/"
-MAINTAINER = "Koen Kooi <koen@handhelds.org>"
+MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 
 DEPENDS = "libsigc++-2.0"
 inherit autotools pkgconfig
diff --git a/packages/gpe-buttonbox/gpe-buttonbox_0.5.bb b/packages/gpe-buttonbox/gpe-buttonbox_0.5.bb
index dc1b439d04..dcf8640611 100644
--- a/packages/gpe-buttonbox/gpe-buttonbox_0.5.bb
+++ b/packages/gpe-buttonbox/gpe-buttonbox_0.5.bb
@@ -1,6 +1,6 @@
 LICENSE =	"GPL"
 DESCIPTION =	"Buttonbox for gpe"
-MAINTAINER =	"Koen Kooi <koen@handhelds.org>"
+MAINTAINER =	"Koen Kooi <koen@linuxtogo.org>"
 
 DEPENDS =	"libgpewidget libgpelaunch"
 
diff --git a/packages/gpe-conf/gpe-conf_0.2.0.bb b/packages/gpe-conf/gpe-conf_0.2.1.bb
index 9cb5b6b059..9cb5b6b059 100644
--- a/packages/gpe-conf/gpe-conf_0.2.0.bb
+++ b/packages/gpe-conf/gpe-conf_0.2.1.bb
diff --git a/packages/gpe-fsi/gpe-fsi_0.1.bb b/packages/gpe-fsi/gpe-fsi_0.1.bb
index 1fc604ff10..1092674485 100644
--- a/packages/gpe-fsi/gpe-fsi_0.1.bb
+++ b/packages/gpe-fsi/gpe-fsi_0.1.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "GPE frontend for libfsi-client"
-MAINTAINER = "Koen Kooi <koen@handhelds.org>"
+MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 LICENSE = "gpl"
 
 inherit gpe
diff --git a/packages/gpe-icons/gpe-icons_0.22.bb b/packages/gpe-icons/gpe-icons_0.22.bb
deleted file mode 100644
index 4b04474b9a..0000000000
--- a/packages/gpe-icons/gpe-icons_0.22.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-inherit gpe
-LICENSE = "GPL"
-DEPENDS = ""
-RDEPENDS = "gdk-pixbuf-loader-png"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-SECTION = "gpe"
-DESCRIPTION = "Common icons for GPE"
-FILES_${PN} = "${datadir}/gpe"
diff --git a/packages/gpe-icons/gpe-icons_0.24.bb b/packages/gpe-icons/gpe-icons_0.24.bb
deleted file mode 100644
index 6c5aa05934..0000000000
--- a/packages/gpe-icons/gpe-icons_0.24.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-inherit gpe
-LICENSE = "GPL"
-DEPENDS = "gtk+"
-RDEPENDS = "gdk-pixbuf-loader-png"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-SECTION = "gpe"
-DESCRIPTION = "Common icons for GPE"
-FILES_${PN} = "${datadir}/gpe"
-
diff --git a/packages/gpe-icons/gpe-icons_0.25.bb b/packages/gpe-icons/gpe-icons_0.25.bb
index 6c5aa05934..8b57800f23 100644
--- a/packages/gpe-icons/gpe-icons_0.25.bb
+++ b/packages/gpe-icons/gpe-icons_0.25.bb
@@ -1,9 +1,16 @@
-inherit gpe
+DESCRIPTION = "Common icons for GPE"
 LICENSE = "GPL"
-DEPENDS = "gtk+"
+SECTION = "gpe"
+
 RDEPENDS = "gdk-pixbuf-loader-png"
+
 MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-SECTION = "gpe"
-DESCRIPTION = "Common icons for GPE"
+
+inherit gpe
+
+PR = "r1"
+
+#only icons present in the package
+PACKAGE_ARCH = "all"
 FILES_${PN} = "${datadir}/gpe"
 
diff --git a/packages/gpe-themes/gpe-theme-e17_0.1.bb b/packages/gpe-themes/gpe-theme-e17_0.1.bb
new file mode 100644
index 0000000000..9ba24d595f
--- /dev/null
+++ b/packages/gpe-themes/gpe-theme-e17_0.1.bb
@@ -0,0 +1,17 @@
+DESCRIPTION =	"GTK+ enlightenment theme adjusted for GPE"
+MAINTAINER =	"Koen Kooi <koen@linuxtogo.org>"
+LICENSE = 	"MIT + GPL"
+PR=		"r0"
+
+#it doesn't really depends on it, but it's nice to make OE build it
+RDEPENDS =		"gtk+"
+
+FILES_${PN} =		"${datadir}/themes/"
+SRC_URI =		"http://linuxtogo.org/~koen/gpe/themes/${P}.tar.gz"
+
+do_install() {
+install -d ${D}${datadir}/themes/
+cp -R ${WORKDIR}/usr/share/themes/e17-bling/  ${D}${datadir}/themes/ 
+}
+
+
diff --git a/packages/gpesyncd/gpesyncd_cvs.bb b/packages/gpesyncd/gpesyncd_cvs.bb
index 94ce44f30e..bafbfbb5ad 100644
--- a/packages/gpesyncd/gpesyncd_cvs.bb
+++ b/packages/gpesyncd/gpesyncd_cvs.bb
@@ -1,6 +1,6 @@
 LICENSE =	"GPL"
 DESCRIPTION =	"Sync daemon for GPE and OpenSync"
-MAINTAINER =	"Koen Kooi <koen@handhelds.org>"
+MAINTAINER =	"Koen Kooi <koen@linuxtogo.org>"
 
 
 SRC_URI =	"${HANDHELDS_CVS};module=gpe/base/gpesyncd"
diff --git a/packages/gpsdrive/gpsdrive_cvs.bb b/packages/gpsdrive/gpsdrive_cvs.bb
index a01f12d094..e1ea27cac0 100644
--- a/packages/gpsdrive/gpsdrive_cvs.bb
+++ b/packages/gpsdrive/gpsdrive_cvs.bb
@@ -9,7 +9,7 @@ PACKAGES += "gpsdrive-add"
 DESCRIPTION = "GPS navigation/map display software"
 DEPENDS = "virtual/libc libart-lgpl gtk+ pcre gpsd"
 RDEPENDS_${PN} = "gdk-pixbuf-loader-gif gpsd"
-MAINTAINER = "Koen Kooi <koen@handhelds.org>"
+MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 SECTION = "x11"
 PRIORITY = "optional"
 LICENSE = "GPL"
diff --git a/packages/gtk+/gtk+_2.6.4-1.osso7.bb b/packages/gtk+/gtk+_2.6.4-1.osso7.bb
index e2065b3faa..774c2eb8d4 100644
--- a/packages/gtk+/gtk+_2.6.4-1.osso7.bb
+++ b/packages/gtk+/gtk+_2.6.4-1.osso7.bb
@@ -4,7 +4,7 @@ set of widgets, GTK+ is suitable for projects ranging from small one-off project
 HOMEPAGE = "http://www.gtk.org"
 SECTION = "libs"
 PRIORITY = "optional"
-MAINTAINER = "Koen Kooi <koen@handhelds.org>"
+MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt"
 PR = "r1"
 
diff --git a/packages/gtkhtml/gtkhtml-2.0_2.6.3.bb b/packages/gtkhtml/gtkhtml-2.0_2.6.3.bb
index 5baee4ada0..59fd90d716 100644
--- a/packages/gtkhtml/gtkhtml-2.0_2.6.3.bb
+++ b/packages/gtkhtml/gtkhtml-2.0_2.6.3.bb
@@ -2,7 +2,7 @@ LICENSE = "GPL"
 SECTION = "x11/libs"
 DESCRIPTION = "HTML rendering/editing library"
 DEPENDS = "gtk+ gail libbonoboui libgnomeprintui libgnomeui gal-2.0"
-MAINTAINER = "Koen Kooi <koen@handhelds.org>"
+MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 PR = "r0"
 
 inherit gnome
diff --git a/packages/h2200-bootloader/h2200-bootloader.bb b/packages/h2200-bootloader/h2200-bootloader.bb
index 03defa2aba..eb36cd50d6 100644
--- a/packages/h2200-bootloader/h2200-bootloader.bb
+++ b/packages/h2200-bootloader/h2200-bootloader.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Bootloader firmware extractor for the h2200 iPAQ"
 ALLOW_EMPTY = "1"
-MAINTAINER = "Koen Kooi <koen@handhelds.org>"
+MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 PR="r2"
 
 pkg_postinst() {
diff --git a/packages/hal/hal_0.5.7.bb b/packages/hal/hal_0.5.7.bb
index c333aebb4f..3361efc6b2 100644
--- a/packages/hal/hal_0.5.7.bb
+++ b/packages/hal/hal_0.5.7.bb
@@ -1,6 +1,6 @@
 SECTION = "unknown"
 DESCRIPTION = "Hardware Abstraction Layer"
-MAINTAINER = "Koen Kooi <koen@handhelds.org>"
+MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 DEPENDS = "dbus expat libusb"
 RDEPENDS += "hotplug"
 RDEPENDS_hal-device-manager = "python hal python-pygnome"
diff --git a/packages/imposter/imposter_0.3.bb b/packages/imposter/imposter_0.3.bb
index 3a1f2c4e6f..27a8131d2c 100644
--- a/packages/imposter/imposter_0.3.bb
+++ b/packages/imposter/imposter_0.3.bb
@@ -1,6 +1,6 @@
 DESCRIPTION =	"Imposter is a standalone viewer for the presentations created by OpenOffice.org Impress software."
 LICENSE =	"GPLv2"
-MAINTAINER =	"Koen Kooi <koen@handhelds.org>"
+MAINTAINER =	"Koen Kooi <koen@linuxtogo.org>"
 
 SRC_URI	=	"${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.gz"
 DEPENDS =	"gtk+"
diff --git a/packages/inkscape/inkscape_0.42.bb b/packages/inkscape/inkscape_0.42.bb
index 9795e88594..64bf17e10a 100644
--- a/packages/inkscape/inkscape_0.42.bb
+++ b/packages/inkscape/inkscape_0.42.bb
@@ -4,7 +4,7 @@ SECTION = "x11/utils"
 DESCRIPTION = "Inkscape is an SVG-based graphics editor featuring alpha \
 blending, node editing, SVG to PNG export, and more. Its goal is for features \
 similar to Illustrator, CorelDraw, Visio, etc."
-MAINTAINER = "Koen Kooi <koen@handhelds.org>"
+MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 DEPENDS = "libgc intltool-native gtk+ gtkmm glibmm libart-lgpl libxslt librsvg libxml2 libsigc++-1.2 popt"
 LICENSE = "GPL"
 
diff --git a/packages/inkscape/inkscape_0.43.bb b/packages/inkscape/inkscape_0.43.bb
index 48b4334291..f813b70afb 100644
--- a/packages/inkscape/inkscape_0.43.bb
+++ b/packages/inkscape/inkscape_0.43.bb
@@ -2,7 +2,7 @@ SECTION = "x11/utils"
 DESCRIPTION = "Inkscape is an SVG-based graphics editor featuring alpha \
 blending, node editing, SVG to PNG export, and more. Its goal is for features \
 similar to Illustrator, CorelDraw, Visio, etc."
-MAINTAINER = "Koen Kooi <koen@handhelds.org>"
+MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 DEPENDS = "libgc intltool-native gtk+ gtkmm glibmm libart-lgpl libxslt librsvg libxml2 libsigc++-1.2 popt"
 LICENSE = "GPL"
 
diff --git a/packages/ipkg/ipkg_0.99.163.bb b/packages/ipkg/ipkg_0.99.163.bb
new file mode 100644
index 0000000000..71c2ffaa82
--- /dev/null
+++ b/packages/ipkg/ipkg_0.99.163.bb
@@ -0,0 +1,17 @@
+include ipkg.inc
+
+S = "${WORKDIR}/ipkg-${PV}"
+
+SRC_URI = "http://www.handhelds.org/pub/packages/ipkg/ipkg-${PV}.tar.gz \
+	file://terse.patch;patch=1"
+
+
+do_stage() {
+	oe_libinstall -so libipkg ${STAGING_LIBDIR}
+	install -d ${STAGING_INCDIR}/libipkg/
+	for f in *.h  
+	do   
+		install -m 0644 $f ${STAGING_INCDIR}/libipkg/   
+	done
+}
+
diff --git a/packages/irda-utils/files/init b/packages/irda-utils/files/init
index 9becfcc0ed..2d93af34df 100755
--- a/packages/irda-utils/files/init
+++ b/packages/irda-utils/files/init
@@ -7,7 +7,7 @@ module_id() {
 if [ ! -f /etc/sysconfig/irda ]; then
 
     case `module_id` in
-	"HP iPAQ H2200" | "HP iPAQ HX4700")
+	"HP iPAQ H2200" | "HP iPAQ HX4700" | "HTC Universal")
 	    IRDA=yes
 	    DEVICE=/dev/ttyS2
 	    DONGLE=
diff --git a/packages/irda-utils/irda-utils_0.9.16.bb b/packages/irda-utils/irda-utils_0.9.16.bb
index db56a7044d..95a15d7d23 100644
--- a/packages/irda-utils/irda-utils_0.9.16.bb
+++ b/packages/irda-utils/irda-utils_0.9.16.bb
@@ -3,7 +3,7 @@ IrDA allows communication over Infrared with other devices \
 such as phones and laptops."
 SECTION = "base"
 LICENSE = "GPL"
-PR = "r5"
+PR = "r6"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/irda/irda-utils-${PV}.tar.gz \
 	   file://configure.patch;patch=1 \
diff --git a/packages/libcroco/libcroco_0.6.0.bb b/packages/libcroco/libcroco_0.6.0.bb
index 69f15d0f8e..465346cd5d 100644
--- a/packages/libcroco/libcroco_0.6.0.bb
+++ b/packages/libcroco/libcroco_0.6.0.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "The Libcroco project is an effort to build a generic Cascading Style Sheet (CSS) parsing and manipulation toolkit"
 SECTION = "x11/utils"
-MAINTAINER = "Koen Kooi <koen@handhelds.org>"
+MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 DEPENDS = "glib-2.0 libxml2"
 LICENSE = "LGPL"
 PR = "r2"
diff --git a/packages/libeina/libeina_0.96.5.bb b/packages/libeina/libeina_0.96.5.bb
index 821cd3323a..d142c5ef67 100644
--- a/packages/libeina/libeina_0.96.5.bb
+++ b/packages/libeina/libeina_0.96.5.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Multimedia library using gstreamer""
 HOMEPAGE = "http://bolgo.cent.uji.es/proyectos/eina"
 LICENSE = "GPL"
-MAINTAINER = "Koen Kooi <koen@handhelds.org>"
+MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 
 DEPENDS = "file glib-2.0 gstreamer"
 
diff --git a/packages/libeina/libeina_0.96.7.bb b/packages/libeina/libeina_0.96.7.bb
index ac25e760dc..515654363e 100644
--- a/packages/libeina/libeina_0.96.7.bb
+++ b/packages/libeina/libeina_0.96.7.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Multimedia library using gstreamer"
 HOMEPAGE = "http://bolgo.cent.uji.es/proyectos/eina"
 LICENSE = "GPL"
-MAINTAINER = "Koen Kooi <koen@handhelds.org>"
+MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 PR = "r2"
 
 DEPENDS = "glib-2.0 gstreamer"
diff --git a/packages/libgpeplugin/libgpeplugin_cvs.bb b/packages/libgpeplugin/libgpeplugin_cvs.bb
index 17cbd86343..ebadfb48a7 100644
--- a/packages/libgpeplugin/libgpeplugin_cvs.bb
+++ b/packages/libgpeplugin/libgpeplugin_cvs.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Plugin system for GPE applications"
 AUTHOR = "Luce DeCicco <ldecicco@gmail.com>"
-MAINTAINER = "Koen Kooi <koen@handhelds.org>"
+MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 
 DEPENDS = "gtk+ libgpewidget"
 PV = "0.0+cvs${SRCDATE}"
diff --git a/packages/libgpevtype/libgpevtype_cvs.bb b/packages/libgpevtype/libgpevtype_cvs.bb
index 31c900dd7e..27714b8f6d 100644
--- a/packages/libgpevtype/libgpevtype_cvs.bb
+++ b/packages/libgpevtype/libgpevtype_cvs.bb
@@ -2,7 +2,7 @@ LICENSE = 	"LGPL"
 DESCRIPTION = 	"Data interchange library for GPE"
 SECTION = 	"gpe/libs"
 PRIORITY = 	"optional"
-MAINTAINER = 	"Koen Kooi <koen@handhelds.org>"
+MAINTAINER = 	"Koen Kooi <koen@linuxtogo.org>"
 DEPENDS = 	"libmimedir"
 
 DEFAULT_PREFERENCE = "-1"
diff --git a/packages/libopie/libopie2/odevice.h-jornada-fixup.patch b/packages/libopie/libopie2/odevice.h-jornada-fixup.patch
index d2e26a0b36..6b50f5de79 100644
--- a/packages/libopie/libopie2/odevice.h-jornada-fixup.patch
+++ b/packages/libopie/libopie2/odevice.h-jornada-fixup.patch
@@ -1,12 +1,13 @@
---- libopie2/opiecore/device/odevice.h	2006-08-06 12:44:20.000000000 +0000
-+++ libopie2/opiecore/device/odevice.h_orig	2006-08-06 12:42:46.000000000 +0000
-@@ -73,8 +73,7 @@
+--- libopie2/opiecore/device/odevice.h_orig	2006-08-06 14:22:16.000000000 +0000
++++ libopie2/opiecore/device/odevice.h	2006-08-06 14:22:58.000000000 +0000
+@@ -73,7 +73,9 @@
      Model_iPAQ_HX4700   = ( Model_iPAQ | 0x000A ),
      Model_Jornada       = ( 6 << 16 ),
      Model_Jornada_56x   = ( Model_Jornada | 0x0001 ),
--    Model_Jornada_6xx   = ( Model_Jornada | 0x0002 ),
--    Model_Jornada_7xx   = ( Model_Jornada | 0x0003 ),
-+    Model_Jornada_720   = ( Model_Jornada | 0x0002 ),
+-    Model_Jornada_720   = ( Model_Jornada | 0x0002 ),
++    Model_Jornada_6xx   = ( Model_Jornada | 0x0003 ),
++    Model_Jornada_7xx   = ( Model_Jornada | 0x0002 ),
++    
  
      Model_Zaurus        = ( 2 << 16 ),
  
diff --git a/packages/libopie/libopie2/odevice_jornada.cpp-fixup.patch b/packages/libopie/libopie2/odevice_jornada.cpp-fixup.patch
index f3eff64b85..8481f0f419 100644
--- a/packages/libopie/libopie2/odevice_jornada.cpp-fixup.patch
+++ b/packages/libopie/libopie2/odevice_jornada.cpp-fixup.patch
@@ -1,5 +1,5 @@
---- libopie2/opiecore/device/odevice_jornada.cpp_orig	2006-08-06 12:36:55.000000000 +0000
-+++ libopie2/opiecore/device/odevice_jornada.cpp	2006-08-06 12:53:45.000000000 +0000
+--- libopie2/opiecore/device/odevice_jornada.cpp_orig	2006-08-06 14:34:15.000000000 +0000
++++ libopie2/opiecore/device/odevice_jornada.cpp	2006-08-06 14:34:53.000000000 +0000
 @@ -125,9 +125,12 @@
      if ( model == "HP Jornada 56x" ) {
          d->m_modelstr = "Jornada 56x";
@@ -27,19 +27,20 @@
          return 255;
      else
      	return 0;
-@@ -185,9 +190,10 @@
+@@ -185,10 +190,11 @@
      	    cmdline = QString::fromLatin1( "echo 4 > /sys/class/backlight/sa1100fb/power");
          else
      	    cmdline = QString::fromLatin1( "echo 0 > /sys/class/backlight/sa1100fb/power; echo %1 > /sys/class/backlight/sa1100fb/brightness" ).arg( bright );
 -    } else if ( d->m_model == Model_Jornada_720 ) {
 +    } else if ( d->m_model == Model_Jornada_7xx ) {
          cmdline = QString::fromLatin1( "echo %1 > /sys/class/backlight/e1356fb/brightness" ).arg( bright );
--    }
 +    } else if ( d->m_model == Model_Jornada_6xx ) {
 +        cmdline = QString::fromLatin1( "echo %1 > /sys/class/backlight/hp680-bl/brightness" ).arg( bright );
- 
+     }
+-
      // No Global::shellQuote as we gurantee it to be sane
      res = ( ::system( QFile::encodeName(cmdline) ) == 0 );
+ 
 @@ -204,9 +210,11 @@
  
      if ( d->m_model == Model_Jornada_56x ) {
diff --git a/packages/libopie/libopie2_1.2.2.bb b/packages/libopie/libopie2_1.2.2.bb
index 220edc215b..6ae22316c5 100644
--- a/packages/libopie/libopie2_1.2.2.bb
+++ b/packages/libopie/libopie2_1.2.2.bb
@@ -3,7 +3,7 @@ require ${PN}.inc
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/libopie2 \
            file://include.pro \
-	   file://odevice.h-jornada-fixup.patch;patch=0 \
-	   file://odevice_jornada.cpp-fixup.patch;patch=0"
+           file://odevice.h-jornada-fixup.patch;patch=1 \
+	   file://odevice_jornada.cpp-fixup.patch;patch=1"
 	   
 SRC_URI_append_poodle = " file://poodle-2.6-hotkeys.patch;patch=1"
diff --git a/packages/libpng/libpng-native_1.2.12.bb b/packages/libpng/libpng-native_1.2.12.bb
new file mode 100644
index 0000000000..231b956678
--- /dev/null
+++ b/packages/libpng/libpng-native_1.2.12.bb
@@ -0,0 +1,14 @@
+require libpng_${PV}.bb
+inherit native
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libpng-${PV}"
+DEPENDS = "zlib-native"
+
+INHIBIT_NATIVE_STAGE_INSTALL = "1"
+
+do_stage_append() {
+        cp libpng.pc libpng12.pc
+        install -m 644 png.h ${STAGING_INCDIR}/png.h
+        install -m 644 pngconf.h ${STAGING_INCDIR}/pngconf.h
+        oe_libinstall -so libpng12 ${STAGING_LIBDIR}/
+        ln -sf libpng12.so ${STAGING_LIBDIR}/libpng.so
+}
diff --git a/packages/libpng/libpng_1.2.12.bb b/packages/libpng/libpng_1.2.12.bb
new file mode 100644
index 0000000000..24117cb0ef
--- /dev/null
+++ b/packages/libpng/libpng_1.2.12.bb
@@ -0,0 +1,72 @@
+DESCRIPTION = "PNG Library"
+HOMEPAGE = "http://www.libpng.org/"
+LICENSE = "libpng"
+SECTION = "libs"
+PRIORITY = "required"
+MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
+PR = "r3"
+
+DEPENDS = "zlib"
+
+PACKAGES =+ "${PN}12-dbg ${PN}12 ${PN}12-dev"
+
+FILES_${PN}12-dbg = ${libdir}/libpng12*.dbg
+FILES_${PN}12 = ${libdir}/libpng12.so.*
+FILES_${PN}12-dev = ${libdir}/libpng12.* ${includedir}/libpng12 ${libdir}/pkgconfig/libpng12.pc
+FILES_${PN} = ${libdir}/lib*.so.*
+FILES_${PN}-dev = ${includedir} ${libdir}/lib*.so ${libdir}/*.la \
+		${libdir}/*.a ${libdir}/pkgconfig \
+		${datadir}/aclocal ${bindir} ${sbindir}
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/libpng/libpng-${PV}.tar.bz2"
+S = "${WORKDIR}/libpng-${PV}"
+
+inherit pkgconfig binconfig pkgconfig
+
+EXTRA_OEMAKE_append = " ZLIBINC=${STAGING_INCDIR} ZLIBLIB=${STAGING_LIBDIR}"
+
+do_compile() {
+	sed < scripts/makefile.linux > makefile -e 's/^ZLIBINC.*//' -e 's/^ZLIBLIB.*//'
+	unset LDFLAGS
+	oe_runmake 'CC=${CC}' 'LD=${LD}' 'CFLAGS=${CFLAGS}' \
+		   'ZLIBINC=${STAGING_INCDIR}' \
+		   'ZLIBLIB=${STAGING_LIBDIR}'
+}
+
+# apperently libpng doesn't expand the vars in libpng.pc, so we'll do that with sed
+# pkgconfig.bbclass will use a similar trick to fix them
+
+do_stage_prepend() {
+	sed -i  -e 's:=@libdir@:=${libdir}:;' \
+		-e 's:=@includedir@:=${includedir}:;' \
+		-e 's:=@prefix@:=${prefix}:' \
+		-e 's:=@exec_prefix@:=${exec_prefix}:' \
+            	-e 's:-lpng12:-lpng12\ -lz\ -lm:' \
+		libpng.pc
+
+}
+
+do_stage() {
+	cp libpng.pc libpng12.pc
+	install -m 644 png.h ${STAGING_INCDIR}/png.h
+	install -m 644 pngconf.h ${STAGING_INCDIR}/pngconf.h
+	oe_libinstall -so libpng12 ${STAGING_LIBDIR}/
+	ln -sf libpng12.so ${STAGING_LIBDIR}/libpng.so
+}
+
+do_install() {
+	install -d ${D}${bindir} ${D}${mandir} \
+		   ${D}${libdir} ${D}${includedir}
+	unset LDFLAGS
+	oe_runmake 'prefix=${prefix}' 'DESTDIR=${D}' \
+		   'DB=${D}${bindir}' 'DI=${D}${includedir}' \
+		   'DL=${D}${libdir}' 'DM=${D}${mandir}' \
+		   install
+}
+
+python do_package() {
+        if bb.data.getVar('DEBIAN_NAMES', d, 1):
+            bb.data.setVar('PKG_${PN}', 'libpng12', d)
+        bb.build.exec_func('package_do_package', d)
+}
+
diff --git a/packages/libsexy/libsexy_0.1.4.bb b/packages/libsexy/libsexy_0.1.4.bb
index 526e1bd6ed..f6d5cbc600 100644
--- a/packages/libsexy/libsexy_0.1.4.bb
+++ b/packages/libsexy/libsexy_0.1.4.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Libsexy is a collection of GTK+ widgets that extend the functionality of such standard widgets as GtkEntry and GtkLabel"
 HOMEPAGE = "http://wiki.chipx86.com/wiki/Libsexy"
 AUTHOR = "Christian Hammond <chipx86@chipx86.com>"
-MAINTAINER = "Koen Kooi <koen@handhelds.org>""
+MAINTAINER = "Koen Kooi <koen@linuxtogo.org>""
 PR = "r1"
 
 DEPENDS = "gtk+ enchant libxml2"
diff --git a/packages/libsexy/libsexy_0.1.5.bb b/packages/libsexy/libsexy_0.1.5.bb
index 5ac5d296fb..e2c63a6648 100644
--- a/packages/libsexy/libsexy_0.1.5.bb
+++ b/packages/libsexy/libsexy_0.1.5.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Libsexy is a collection of GTK+ widgets that extend the functionality of such standard widgets as GtkEntry and GtkLabel"
 HOMEPAGE = "http://wiki.chipx86.com/wiki/Libsexy"
 AUTHOR = "Christian Hammond <chipx86@chipx86.com>"
-MAINTAINER = "Koen Kooi <koen@handhelds.org>""
+MAINTAINER = "Koen Kooi <koen@linuxtogo.org>""
 PR = "r0"
 
 DEPENDS = "gtk+ enchant libxml2"
diff --git a/packages/libsexy/libsexy_0.1.6.bb b/packages/libsexy/libsexy_0.1.6.bb
index 5ac5d296fb..e2c63a6648 100644
--- a/packages/libsexy/libsexy_0.1.6.bb
+++ b/packages/libsexy/libsexy_0.1.6.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Libsexy is a collection of GTK+ widgets that extend the functionality of such standard widgets as GtkEntry and GtkLabel"
 HOMEPAGE = "http://wiki.chipx86.com/wiki/Libsexy"
 AUTHOR = "Christian Hammond <chipx86@chipx86.com>"
-MAINTAINER = "Koen Kooi <koen@handhelds.org>""
+MAINTAINER = "Koen Kooi <koen@linuxtogo.org>""
 PR = "r0"
 
 DEPENDS = "gtk+ enchant libxml2"
diff --git a/packages/libsexy/libsexy_0.1.8.bb b/packages/libsexy/libsexy_0.1.8.bb
index 4e55160042..0c714ec633 100644
--- a/packages/libsexy/libsexy_0.1.8.bb
+++ b/packages/libsexy/libsexy_0.1.8.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Libsexy is a collection of GTK+ widgets that extend the functionality of such standard widgets as GtkEntry and GtkLabel"
 HOMEPAGE = "http://wiki.chipx86.com/wiki/Libsexy"
 AUTHOR = "Christian Hammond <chipx86@chipx86.com>"
-MAINTAINER = "Koen Kooi <koen@handhelds.org>""
+MAINTAINER = "Koen Kooi <koen@linuxtogo.org>""
 PR = "r0"
 
 DEPENDS = "gtk+ enchant libxml2"
diff --git a/packages/linux/LAB-kernel_2.6.13-hh2.bb b/packages/linux/LAB-kernel_2.6.13-hh2.bb
index eb5e97cc70..3a32616d45 100644
--- a/packages/linux/LAB-kernel_2.6.13-hh2.bb
+++ b/packages/linux/LAB-kernel_2.6.13-hh2.bb
@@ -1,9 +1,8 @@
 SECTION = "kernel"
 DESCRIPTION = "Liux As Bootloader kernelm"
-MAINTAINER = "Koen Kooi <koen@handhelds.org>"
+MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 LICENSE = "GPL"
 
-KERNEL_CCSUFFIX = "-3.4.4"
 COMPATIBLE_HOST = "arm.*-linux"
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/handhelds-pxa-${PV}"
diff --git a/packages/linux/LAB-kernel_cvs.bb b/packages/linux/LAB-kernel_cvs.bb
index 22128880ed..156c26693b 100644
--- a/packages/linux/LAB-kernel_cvs.bb
+++ b/packages/linux/LAB-kernel_cvs.bb
@@ -1,6 +1,6 @@
 SECTION = "kernel"
 DESCRIPTION = "Liux As Bootloader kernelm"
-MAINTAINER = "Koen Kooi <koen@handhelds.org>"
+MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 LICENSE = "GPL"
 PV = "${K_MAJOR}.${K_MINOR}.${K_MICRO}-hh${HHV}+cvs${SRCDATE}"
 
@@ -9,7 +9,6 @@ PV = "${K_MAJOR}.${K_MINOR}.${K_MICRO}-hh${HHV}+cvs${SRCDATE}"
 
 DEFAULT_PREFERENCE = "-1"
 
-KERNEL_CCSUFFIX = "-3.4.4"
 COMPATIBLE_HOST = "arm.*-linux"
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/handhelds-pxa-${PV}"
diff --git a/packages/linux/handhelds-pxa-2.6/h2200/defconfig b/packages/linux/handhelds-pxa-2.6/h2200/defconfig
index 79187ffa99..eb68f48801 100644
--- a/packages/linux/handhelds-pxa-2.6/h2200/defconfig
+++ b/packages/linux/handhelds-pxa-2.6/h2200/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.16-hh0
-# Thu May 11 10:23:12 2006
+# Linux kernel version: 2.6.16-hh5
+# Thu Aug 10 15:54:59 2006
 #
 CONFIG_ARM=y
 CONFIG_MMU=y
@@ -129,6 +129,12 @@ CONFIG_ARCH_H2200=y
 # CONFIG_MACH_HX2750 is not set
 # CONFIG_ARCH_H5400 is not set
 # CONFIG_MACH_HIMALAYA is not set
+# CONFIG_MACH_HTCUNIVERSAL is not set
+# CONFIG_MACH_HTCALPINE is not set
+# CONFIG_MACH_MAGICIAN is not set
+# CONFIG_MACH_HTCAPACHE is not set
+# CONFIG_MACH_BLUEANGEL is not set
+# CONFIG_MACH_HTCBEETLES is not set
 # CONFIG_ARCH_AXIMX5 is not set
 # CONFIG_ARCH_AXIMX3 is not set
 # CONFIG_ARCH_ROVERP1 is not set
@@ -213,7 +219,8 @@ CONFIG_PCMCIA_H2200=y
 #
 CONFIG_PREEMPT=y
 CONFIG_NO_IDLE_HZ=y
-# CONFIG_AEABI is not set
+CONFIG_AEABI=y
+CONFIG_OABI_COMPAT=y
 # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
 CONFIG_SELECT_MEMORY_MODEL=y
 CONFIG_FLATMEM_MANUAL=y
@@ -236,9 +243,19 @@ CONFIG_CMDLINE="console=ttyS0,115200n8 root=/dev/mmcblk0p1"
 #
 # CPU Frequency scaling
 #
-# CONFIG_CPU_FREQ is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
+CONFIG_CPU_FREQ=y
+CONFIG_CPU_FREQ_TABLE=y
+# CONFIG_CPU_FREQ_DEBUG is not set
+CONFIG_CPU_FREQ_STAT=y
+CONFIG_CPU_FREQ_STAT_DETAILS=y
+CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
 # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
+CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
+CONFIG_CPU_FREQ_GOV_POWERSAVE=y
+CONFIG_CPU_FREQ_GOV_USERSPACE=y
+# CONFIG_CPU_FREQ_GOV_ONDEMAND is not set
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
+CONFIG_CPU_FREQ_PXA=y
 CONFIG_PXA25x_ALTERNATE_FREQS=y
 
 #
@@ -258,7 +275,6 @@ CONFIG_FPE_FASTFPE=y
 CONFIG_BINFMT_ELF=y
 # CONFIG_BINFMT_AOUT is not set
 CONFIG_BINFMT_MISC=m
-# CONFIG_ARTHUR is not set
 
 #
 # Power management options
@@ -1094,11 +1110,13 @@ CONFIG_SOUND=y
 CONFIG_SND=y
 CONFIG_SND_TIMER=y
 CONFIG_SND_PCM=y
+CONFIG_SND_HWDEP=m
+CONFIG_SND_RAWMIDI=m
 # CONFIG_SND_SEQUENCER is not set
 CONFIG_SND_OSSEMUL=y
 CONFIG_SND_MIXER_OSS=m
 CONFIG_SND_PCM_OSS=m
-# CONFIG_SND_DYNAMIC_MINORS is not set
+CONFIG_SND_DYNAMIC_MINORS=y
 CONFIG_SND_SUPPORT_OLD_API=y
 # CONFIG_SND_VERBOSE_PRINTK is not set
 # CONFIG_SND_DEBUG is not set
@@ -1117,7 +1135,9 @@ CONFIG_SND_SUPPORT_OLD_API=y
 # CONFIG_SND_A716 is not set
 # CONFIG_SND_H1910 is not set
 CONFIG_SND_H2200=y
+# CONFIG_SND_HTCMAGICIAN is not set
 # CONFIG_SND_HX4700 is not set
+# CONFIG_SND_HTCUNIVERSAL is not set
 # CONFIG_SND_H5XXX_AK4535 is not set
 CONFIG_SND_PXA2xx_I2SOUND=y
 # CONFIG_SND_PXA2XX_AC97 is not set
@@ -1125,7 +1145,7 @@ CONFIG_SND_PXA2xx_I2SOUND=y
 #
 # USB devices
 #
-# CONFIG_SND_USB_AUDIO is not set
+CONFIG_SND_USB_AUDIO=m
 
 #
 # PCMCIA devices
@@ -1157,7 +1177,7 @@ CONFIG_USB_DEVICEFS=y
 #
 # USB Host Controller Drivers
 #
-# CONFIG_USB_ISP116X_HCD is not set
+CONFIG_USB_ISP116X_HCD=m
 CONFIG_USB_SL811_HCD=m
 CONFIG_USB_SL811_CS=m
 
@@ -1181,7 +1201,11 @@ CONFIG_USB_SL811_CS=m
 #
 # USB Input Devices
 #
-# CONFIG_USB_HID is not set
+CONFIG_USB_HID=m
+CONFIG_USB_HIDINPUT=y
+# CONFIG_USB_HIDINPUT_POWERBOOK is not set
+# CONFIG_HID_FF is not set
+# CONFIG_USB_HIDDEV is not set
 
 #
 # USB HID Boot Protocol drivers
@@ -1220,19 +1244,31 @@ CONFIG_USB_SL811_CS=m
 # CONFIG_USB_KONICAWC is not set
 # CONFIG_USB_OV511 is not set
 # CONFIG_USB_SE401 is not set
-# CONFIG_USB_SN9C102 is not set
+CONFIG_USB_SN9C102=m
 # CONFIG_USB_STV680 is not set
-# CONFIG_USB_PWC is not set
+CONFIG_USB_PWC=m
 
 #
 # USB Network Adapters
 #
-# CONFIG_USB_CATC is not set
-# CONFIG_USB_KAWETH is not set
-# CONFIG_USB_PEGASUS is not set
-# CONFIG_USB_RTL8150 is not set
-# CONFIG_USB_USBNET is not set
-# CONFIG_USB_ZD1201 is not set
+CONFIG_USB_CATC=m
+CONFIG_USB_KAWETH=m
+CONFIG_USB_PEGASUS=m
+CONFIG_USB_RTL8150=m
+CONFIG_USB_USBNET=m
+CONFIG_USB_NET_CDCETHER=m
+# CONFIG_USB_NET_GL620A is not set
+CONFIG_USB_NET_NET1080=m
+# CONFIG_USB_NET_PLUSB is not set
+# CONFIG_USB_NET_RNDIS_HOST is not set
+CONFIG_USB_NET_CDC_SUBSET=m
+# CONFIG_USB_ALI_M5632 is not set
+# CONFIG_USB_AN2720 is not set
+CONFIG_USB_BELKIN=y
+CONFIG_USB_ARMLINUX=y
+# CONFIG_USB_EPSON2888 is not set
+CONFIG_USB_NET_ZAURUS=m
+CONFIG_USB_ZD1201=m
 CONFIG_USB_MON=y
 
 #
@@ -1305,7 +1341,8 @@ CONFIG_MMC_SAMCOP=y
 #
 # LED devices
 #
-# CONFIG_CLASS_LEDS is not set
+CONFIG_CLASS_LEDS=y
+CONFIG_LEDS_H2200=y
 
 #
 # File systems
@@ -1380,8 +1417,8 @@ CONFIG_SYSFS=y
 CONFIG_TMPFS=y
 # CONFIG_HUGETLB_PAGE is not set
 CONFIG_RAMFS=y
-# CONFIG_RELAYFS_FS is not set
-# CONFIG_CONFIGFS_FS is not set
+CONFIG_RELAYFS_FS=m
+CONFIG_CONFIGFS_FS=m
 
 #
 # Miscellaneous filesystems
@@ -1389,7 +1426,7 @@ CONFIG_RAMFS=y
 # CONFIG_ADFS_FS is not set
 # CONFIG_AFFS_FS is not set
 # CONFIG_HFS_FS is not set
-# CONFIG_HFSPLUS_FS is not set
+CONFIG_HFSPLUS_FS=m
 # CONFIG_BEFS_FS is not set
 # CONFIG_BFS_FS is not set
 # CONFIG_EFS_FS is not set
@@ -1417,20 +1454,23 @@ CONFIG_CRAMFS=m
 #
 CONFIG_NFS_FS=m
 CONFIG_NFS_V3=y
-# CONFIG_NFS_V3_ACL is not set
-# CONFIG_NFS_V4 is not set
-# CONFIG_NFS_DIRECTIO is not set
+CONFIG_NFS_V3_ACL=y
+CONFIG_NFS_V4=y
+CONFIG_NFS_DIRECTIO=y
 CONFIG_NFSD=m
+CONFIG_NFSD_V2_ACL=y
 CONFIG_NFSD_V3=y
-# CONFIG_NFSD_V3_ACL is not set
-# CONFIG_NFSD_V4 is not set
-# CONFIG_NFSD_TCP is not set
+CONFIG_NFSD_V3_ACL=y
+CONFIG_NFSD_V4=y
+CONFIG_NFSD_TCP=y
 CONFIG_LOCKD=m
 CONFIG_LOCKD_V4=y
 CONFIG_EXPORTFS=m
+CONFIG_NFS_ACL_SUPPORT=m
 CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=m
-# CONFIG_RPCSEC_GSS_KRB5 is not set
+CONFIG_SUNRPC_GSS=m
+CONFIG_RPCSEC_GSS_KRB5=m
 # CONFIG_RPCSEC_GSS_SPKM3 is not set
 CONFIG_SMB_FS=m
 # CONFIG_SMB_NLS_DEFAULT is not set
@@ -1444,7 +1484,7 @@ CONFIG_CODA_FS=m
 # CONFIG_CODA_FS_OLD_API is not set
 CONFIG_AFS_FS=m
 CONFIG_RXRPC=m
-# CONFIG_9P_FS is not set
+CONFIG_9P_FS=m
 
 #
 # Partition Types
diff --git a/packages/dbus/dbus-0.90/.mtn2git_empty b/packages/linux/handhelds-pxa-2.6/h5xxx/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/dbus/dbus-0.90/.mtn2git_empty
+++ b/packages/linux/handhelds-pxa-2.6/h5xxx/.mtn2git_empty
diff --git a/packages/linux/handhelds-pxa-2.6/h5xxx/defconfig b/packages/linux/handhelds-pxa-2.6/h5xxx/defconfig
new file mode 100644
index 0000000000..0034b9142c
--- /dev/null
+++ b/packages/linux/handhelds-pxa-2.6/h5xxx/defconfig
@@ -0,0 +1,1540 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.16-hh5
+# Thu Aug 10 14:18:29 2006
+#
+CONFIG_ARM=y
+CONFIG_MMU=y
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_ARCH_MTD_XIP=y
+
+#
+# Code maturity level options
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_BROKEN_ON_SMP=y
+CONFIG_LOCK_KERNEL=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+
+#
+# General setup
+#
+CONFIG_LOCALVERSION=""
+CONFIG_LOCALVERSION_AUTO=y
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+# CONFIG_POSIX_MQUEUE is not set
+CONFIG_BSD_PROCESS_ACCT=y
+# CONFIG_BSD_PROCESS_ACCT_V3 is not set
+CONFIG_SYSCTL=y
+# CONFIG_AUDIT is not set
+CONFIG_IKCONFIG=y
+# CONFIG_MINIMAL_OOPS is not set
+CONFIG_IKCONFIG_PROC=y
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_UID16=y
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_EMBEDDED=y
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_ALL is not set
+# CONFIG_KALLSYMS_EXTRA_PASS is not set
+CONFIG_HOTPLUG=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_EPOLL=y
+CONFIG_SHMEM=y
+CONFIG_USELIB=y
+CONFIG_CORE_DUMP=y
+CONFIG_CC_ALIGN_FUNCTIONS=0
+CONFIG_CC_ALIGN_LABELS=0
+CONFIG_CC_ALIGN_LOOPS=0
+CONFIG_CC_ALIGN_JUMPS=0
+CONFIG_SLAB=y
+# CONFIG_TINY_SHMEM is not set
+CONFIG_BASE_SMALL=0
+# CONFIG_SLOB is not set
+CONFIG_OBSOLETE_INTERMODULE=y
+
+#
+# Loadable module support
+#
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODULE_FORCE_UNLOAD=y
+CONFIG_OBSOLETE_MODPARM=y
+# CONFIG_MODVERSIONS is not set
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+CONFIG_KMOD=y
+
+#
+# Block layer
+#
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_AS=y
+CONFIG_IOSCHED_DEADLINE=y
+# CONFIG_IOSCHED_CFQ is not set
+CONFIG_DEFAULT_AS=y
+# CONFIG_DEFAULT_DEADLINE is not set
+# CONFIG_DEFAULT_CFQ is not set
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="anticipatory"
+
+#
+# System Type
+#
+# CONFIG_ARCH_CLPS7500 is not set
+# CONFIG_ARCH_CLPS711X is not set
+# CONFIG_ARCH_CO285 is not set
+# CONFIG_ARCH_EBSA110 is not set
+# CONFIG_ARCH_FOOTBRIDGE is not set
+# CONFIG_ARCH_INTEGRATOR is not set
+# CONFIG_ARCH_IOP3XX is not set
+# CONFIG_ARCH_IXP4XX is not set
+# CONFIG_ARCH_IXP2000 is not set
+# CONFIG_ARCH_L7200 is not set
+CONFIG_ARCH_PXA=y
+# CONFIG_ARCH_RPC is not set
+# CONFIG_ARCH_SA1100 is not set
+# CONFIG_ARCH_S3C2410 is not set
+# CONFIG_ARCH_SHARK is not set
+# CONFIG_ARCH_LH7A40X is not set
+# CONFIG_ARCH_OMAP is not set
+# CONFIG_ARCH_VERSATILE is not set
+# CONFIG_ARCH_REALVIEW is not set
+# CONFIG_ARCH_IMX is not set
+# CONFIG_ARCH_H720X is not set
+# CONFIG_ARCH_AAEC2000 is not set
+# CONFIG_ARCH_AT91RM9200 is not set
+
+#
+# Intel PXA2xx Implementations
+#
+# CONFIG_ARCH_LUBBOCK is not set
+# CONFIG_MACH_MAINSTONE is not set
+# CONFIG_ARCH_PXA_IDP is not set
+# CONFIG_ARCH_ESERIES is not set
+# CONFIG_MACH_A620 is not set
+# CONFIG_MACH_A716 is not set
+# CONFIG_ARCH_H1900 is not set
+# CONFIG_ARCH_H2200 is not set
+# CONFIG_ARCH_H3900 is not set
+# CONFIG_MACH_H4000 is not set
+# CONFIG_MACH_H4700 is not set
+# CONFIG_MACH_HX2750 is not set
+CONFIG_ARCH_H5400=y
+# CONFIG_IPAQ_H5400_LCD is not set
+CONFIG_IPAQ_H5400_BATTERY=m
+# CONFIG_MACH_HIMALAYA is not set
+# CONFIG_MACH_HTCUNIVERSAL is not set
+# CONFIG_MACH_HTCALPINE is not set
+# CONFIG_MACH_MAGICIAN is not set
+# CONFIG_MACH_HTCAPACHE is not set
+# CONFIG_MACH_BLUEANGEL is not set
+# CONFIG_MACH_HTCBEETLES is not set
+# CONFIG_ARCH_AXIMX5 is not set
+# CONFIG_ARCH_AXIMX3 is not set
+# CONFIG_ARCH_ROVERP1 is not set
+# CONFIG_ARCH_ROVERP5P is not set
+# CONFIG_MACH_XSCALE_PALMLD is not set
+# CONFIG_MACH_T3XSCALE is not set
+# CONFIG_PXA_SHARPSL is not set
+CONFIG_PXA25x=y
+# CONFIG_SA1100_H3100 is not set
+# CONFIG_SA1100_H3600 is not set
+# CONFIG_SA1100_H3800 is not set
+
+#
+# Linux As Bootloader
+#
+# CONFIG_LAB is not set
+
+#
+# Processor Type
+#
+CONFIG_CPU_32=y
+CONFIG_CPU_XSCALE=y
+CONFIG_CPU_32v5=y
+CONFIG_CPU_ABRT_EV5T=y
+CONFIG_CPU_CACHE_VIVT=y
+CONFIG_CPU_TLB_V4WBI=y
+
+#
+# Processor Features
+#
+CONFIG_ARM_THUMB=y
+CONFIG_XSCALE_PMU=y
+CONFIG_KEXEC=y
+
+#
+# Compaq/iPAQ Platforms
+#
+CONFIG_PXA_IPAQ=y
+
+#
+# XScale-based iPAQ
+#
+CONFIG_IPAQ_HANDHELD=y
+
+#
+# Compaq/iPAQ Drivers
+#
+
+#
+# Compaq/HP iPAQ Drivers
+#
+CONFIG_IPAQ_CLOCKS=y
+CONFIG_IPAQ_SLEEVE=m
+CONFIG_IPAQ_SAMCOP=y
+# CONFIG_IPAQ_HAMCOP is not set
+CONFIG_IPAQ_SAMCOP_TOUCHSCREEN=y
+# CONFIG_IPAQ_SAMCOP_FSI is not set
+# CONFIG_IPAQ_SAMCOP_SLEEVE is not set
+# CONFIG_IPAQ_SAMCOP_DMA is not set
+CONFIG_DMABOUNCE=y
+
+#
+# Bus support
+#
+
+#
+# PCCARD (PCMCIA/CardBus) support
+#
+CONFIG_PCCARD=m
+# CONFIG_PCMCIA_DEBUG is not set
+CONFIG_PCMCIA=m
+CONFIG_PCMCIA_LOAD_CIS=y
+CONFIG_PCMCIA_IOCTL=y
+
+#
+# PC-card bridges
+#
+CONFIG_PCMCIA_PXA2XX=m
+CONFIG_IPAQ_PCMCIA_SLEEVE=m
+
+#
+# Kernel Features
+#
+CONFIG_PREEMPT=y
+# CONFIG_NO_IDLE_HZ is not set
+CONFIG_AEABI=y
+CONFIG_OABI_COMPAT=y
+# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+# CONFIG_SPARSEMEM_STATIC is not set
+CONFIG_SPLIT_PTLOCK_CPUS=4096
+CONFIG_ALIGNMENT_TRAP=y
+
+#
+# Boot options
+#
+CONFIG_ZBOOT_ROM_TEXT=0x0
+CONFIG_ZBOOT_ROM_BSS=0x0
+CONFIG_CMDLINE="keepinitrd"
+# CONFIG_XIP_KERNEL is not set
+
+#
+# CPU Frequency scaling
+#
+# CONFIG_CPU_FREQ is not set
+
+#
+# Floating point emulation
+#
+
+#
+# At least one emulation must be selected
+#
+CONFIG_FPE_NWFPE=y
+# CONFIG_FPE_NWFPE_XP is not set
+# CONFIG_FPE_FASTFPE is not set
+
+#
+# Userspace binary formats
+#
+CONFIG_BINFMT_ELF=y
+# CONFIG_BINFMT_AOUT is not set
+CONFIG_BINFMT_MISC=m
+
+#
+# Power management options
+#
+CONFIG_PM=y
+CONFIG_PM_LEGACY=y
+# CONFIG_PM_DEBUG is not set
+CONFIG_APM=m
+
+#
+# Networking
+#
+CONFIG_NET=y
+
+#
+# Networking options
+#
+# CONFIG_NETDEBUG is not set
+CONFIG_PACKET=y
+CONFIG_PACKET_MMAP=y
+CONFIG_UNIX=y
+CONFIG_XFRM=y
+CONFIG_XFRM_USER=m
+CONFIG_NET_KEY=m
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+# CONFIG_IP_ADVANCED_ROUTER is not set
+CONFIG_IP_FIB_HASH=y
+# CONFIG_IP_PNP is not set
+CONFIG_NET_IPIP=m
+CONFIG_NET_IPGRE=m
+CONFIG_NET_IPGRE_BROADCAST=y
+# CONFIG_IP_MROUTE is not set
+# CONFIG_ARPD is not set
+# CONFIG_SYN_COOKIES is not set
+CONFIG_INET_AH=m
+CONFIG_INET_ESP=m
+CONFIG_INET_IPCOMP=m
+CONFIG_INET_TUNNEL=m
+CONFIG_INET_DIAG=y
+CONFIG_INET_TCP_DIAG=y
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_BIC=y
+
+#
+# IP: Virtual Server Configuration
+#
+# CONFIG_IP_VS is not set
+CONFIG_IPV6=m
+# CONFIG_IPV6_PRIVACY is not set
+CONFIG_INET6_AH=m
+CONFIG_INET6_ESP=m
+CONFIG_INET6_IPCOMP=m
+CONFIG_INET6_TUNNEL=m
+CONFIG_IPV6_TUNNEL=m
+CONFIG_NETFILTER=y
+# CONFIG_NETFILTER_DEBUG is not set
+CONFIG_BRIDGE_NETFILTER=y
+
+#
+# Core Netfilter Configuration
+#
+# CONFIG_NETFILTER_NETLINK is not set
+# CONFIG_NETFILTER_XTABLES is not set
+
+#
+# IP: Netfilter Configuration
+#
+CONFIG_IP_NF_CONNTRACK=m
+# CONFIG_IP_NF_CT_ACCT is not set
+# CONFIG_IP_NF_CONNTRACK_MARK is not set
+# CONFIG_IP_NF_CONNTRACK_EVENTS is not set
+# CONFIG_IP_NF_CT_PROTO_SCTP is not set
+CONFIG_IP_NF_FTP=m
+CONFIG_IP_NF_IRC=m
+# CONFIG_IP_NF_NETBIOS_NS is not set
+# CONFIG_IP_NF_TFTP is not set
+# CONFIG_IP_NF_AMANDA is not set
+# CONFIG_IP_NF_PPTP is not set
+# CONFIG_IP_NF_QUEUE is not set
+
+#
+# IPv6: Netfilter Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP6_NF_QUEUE is not set
+
+#
+# Bridge: Netfilter Configuration
+#
+# CONFIG_BRIDGE_NF_EBTABLES is not set
+
+#
+# DCCP Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_DCCP is not set
+
+#
+# SCTP Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_SCTP is not set
+
+#
+# TIPC Configuration (EXPERIMENTAL)
+#
+# CONFIG_TIPC is not set
+# CONFIG_ATM is not set
+CONFIG_BRIDGE=m
+# CONFIG_VLAN_8021Q is not set
+# CONFIG_DECNET is not set
+# CONFIG_LLC2 is not set
+# CONFIG_IPX is not set
+# CONFIG_ATALK is not set
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_NET_DIVERT is not set
+# CONFIG_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
+
+#
+# QoS and/or fair queueing
+#
+# CONFIG_NET_SCHED is not set
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_HAMRADIO is not set
+CONFIG_IRDA=m
+
+#
+# IrDA protocols
+#
+CONFIG_IRLAN=m
+CONFIG_IRNET=m
+CONFIG_IRCOMM=m
+CONFIG_IRDA_ULTRA=y
+
+#
+# IrDA options
+#
+CONFIG_IRDA_CACHE_LAST_LSAP=y
+CONFIG_IRDA_FAST_RR=y
+CONFIG_IRDA_DEBUG=y
+
+#
+# Infrared-port device drivers
+#
+
+#
+# SIR device drivers
+#
+CONFIG_IRTTY_SIR=m
+
+#
+# Dongle support
+#
+# CONFIG_DONGLE is not set
+
+#
+# Old SIR device drivers
+#
+CONFIG_IRPORT_SIR=m
+
+#
+# Old Serial dongle support
+#
+# CONFIG_DONGLE_OLD is not set
+
+#
+# FIR device drivers
+#
+# CONFIG_USB_IRDA is not set
+# CONFIG_SIGMATEL_FIR is not set
+# CONFIG_PXA_FICP is not set
+CONFIG_BT=m
+CONFIG_BT_L2CAP=m
+CONFIG_BT_SCO=m
+CONFIG_BT_RFCOMM=m
+CONFIG_BT_RFCOMM_TTY=y
+CONFIG_BT_BNEP=m
+# CONFIG_BT_BNEP_MC_FILTER is not set
+# CONFIG_BT_BNEP_PROTO_FILTER is not set
+CONFIG_BT_HIDP=m
+
+#
+# Bluetooth device drivers
+#
+CONFIG_BT_HCIUSB=m
+CONFIG_BT_HCIUSB_SCO=y
+CONFIG_BT_HCIUART=m
+CONFIG_BT_HCIUART_H4=y
+CONFIG_BT_HCIUART_BCSP=y
+CONFIG_BT_HCIBCM203X=m
+# CONFIG_BT_HCIBPA10X is not set
+# CONFIG_BT_HCIBFUSB is not set
+CONFIG_BT_HCIDTL1=m
+CONFIG_BT_HCIBT3C=m
+# CONFIG_BT_HCIBLUECARD is not set
+CONFIG_BT_HCIBTUART=m
+# CONFIG_BT_HCIVHCI is not set
+CONFIG_IEEE80211=m
+# CONFIG_IEEE80211_DEBUG is not set
+CONFIG_IEEE80211_CRYPT_WEP=m
+CONFIG_IEEE80211_CRYPT_CCMP=m
+CONFIG_IEEE80211_CRYPT_TKIP=m
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+CONFIG_FW_LOADER=m
+# CONFIG_DEBUG_DRIVER is not set
+
+#
+# Connector - unified userspace <-> kernelspace linker
+#
+# CONFIG_CONNECTOR is not set
+
+#
+# Memory Technology Devices (MTD)
+#
+CONFIG_MTD=y
+CONFIG_MTD_DEBUG=y
+CONFIG_MTD_DEBUG_VERBOSE=1
+CONFIG_MTD_CONCAT=m
+CONFIG_MTD_PARTITIONS=y
+# CONFIG_MTD_REDBOOT_PARTS is not set
+CONFIG_MTD_CMDLINE_PARTS=y
+# CONFIG_MTD_AFS_PARTS is not set
+
+#
+# User Modules And Translation Layers
+#
+CONFIG_MTD_CHAR=m
+CONFIG_MTD_BLOCK=y
+# CONFIG_FTL is not set
+# CONFIG_NFTL is not set
+# CONFIG_INFTL is not set
+# CONFIG_RFD_FTL is not set
+
+#
+# RAM/ROM/Flash chip drivers
+#
+CONFIG_MTD_CFI=y
+# CONFIG_MTD_JEDECPROBE is not set
+CONFIG_MTD_GEN_PROBE=y
+CONFIG_MTD_CFI_ADV_OPTIONS=y
+CONFIG_MTD_CFI_NOSWAP=y
+# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set
+# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set
+CONFIG_MTD_CFI_GEOMETRY=y
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+CONFIG_MTD_MAP_BANK_WIDTH_4=y
+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
+CONFIG_MTD_CFI_I1=y
+CONFIG_MTD_CFI_I2=y
+# CONFIG_MTD_CFI_I4 is not set
+# CONFIG_MTD_CFI_I8 is not set
+# CONFIG_MTD_OTP is not set
+CONFIG_MTD_CFI_INTELEXT=y
+# CONFIG_MTD_CFI_AMDSTD is not set
+# CONFIG_MTD_CFI_STAA is not set
+CONFIG_MTD_CFI_UTIL=y
+# CONFIG_MTD_RAM is not set
+# CONFIG_MTD_ROM is not set
+# CONFIG_MTD_ABSENT is not set
+# CONFIG_MTD_OBSOLETE_CHIPS is not set
+# CONFIG_MTD_XIP is not set
+
+#
+# Mapping drivers for chip access
+#
+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
+# CONFIG_MTD_PHYSMAP is not set
+# CONFIG_MTD_ARM_INTEGRATOR is not set
+CONFIG_MTD_IPAQ=y
+# CONFIG_MTD_SHARP_SL is not set
+# CONFIG_MTD_PLATRAM is not set
+
+#
+# Self-contained MTD device drivers
+#
+# CONFIG_MTD_SLRAM is not set
+# CONFIG_MTD_PHRAM is not set
+# CONFIG_MTD_MTDRAM is not set
+# CONFIG_MTD_BLKMTD is not set
+# CONFIG_MTD_BLOCK2MTD is not set
+
+#
+# Disk-On-Chip Device Drivers
+#
+# CONFIG_MTD_DOC2000 is not set
+# CONFIG_MTD_DOC2001 is not set
+# CONFIG_MTD_DOC2001PLUS is not set
+
+#
+# NAND Flash Device Drivers
+#
+CONFIG_MTD_NAND=m
+# CONFIG_MTD_NAND_VERIFY_WRITE is not set
+# CONFIG_MTD_NAND_H1900 is not set
+CONFIG_MTD_NAND_IDS=m
+# CONFIG_MTD_NAND_DISKONCHIP is not set
+# CONFIG_MTD_NAND_SHARPSL is not set
+# CONFIG_MTD_NAND_NANDSIM is not set
+
+#
+# OneNAND Flash Device Drivers
+#
+# CONFIG_MTD_ONENAND is not set
+
+#
+# Parallel port support
+#
+# CONFIG_PARPORT is not set
+
+#
+# Plug and Play support
+#
+
+#
+# Block devices
+#
+# CONFIG_BLK_DEV_COW_COMMON is not set
+CONFIG_BLK_DEV_LOOP=m
+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
+CONFIG_BLK_DEV_NBD=m
+# CONFIG_BLK_DEV_UB is not set
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=8192
+CONFIG_BLK_DEV_INITRD=y
+# CONFIG_CDROM_PKTCDVD is not set
+# CONFIG_ATA_OVER_ETH is not set
+
+#
+# ATA/ATAPI/MFM/RLL support
+#
+CONFIG_IDE=m
+CONFIG_BLK_DEV_IDE=m
+
+#
+# Please see Documentation/ide.txt for help/info on IDE drives
+#
+# CONFIG_BLK_DEV_IDE_SATA is not set
+CONFIG_BLK_DEV_IDEDISK=m
+# CONFIG_IDEDISK_MULTI_MODE is not set
+CONFIG_BLK_DEV_IDECS=m
+CONFIG_BLK_DEV_IDECD=m
+CONFIG_BLK_DEV_IDETAPE=m
+CONFIG_BLK_DEV_IDEFLOPPY=m
+# CONFIG_BLK_DEV_IDESCSI is not set
+# CONFIG_IDE_TASK_IOCTL is not set
+
+#
+# IDE chipset support/bugfixes
+#
+CONFIG_IDE_GENERIC=m
+# CONFIG_IDE_ARM is not set
+# CONFIG_BLK_DEV_IDEDMA is not set
+# CONFIG_IDEDMA_AUTO is not set
+# CONFIG_BLK_DEV_HD is not set
+
+#
+# SCSI device support
+#
+# CONFIG_RAID_ATTRS is not set
+CONFIG_SCSI=m
+CONFIG_SCSI_PROC_FS=y
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=m
+# CONFIG_CHR_DEV_ST is not set
+# CONFIG_CHR_DEV_OSST is not set
+CONFIG_BLK_DEV_SR=m
+# CONFIG_BLK_DEV_SR_VENDOR is not set
+CONFIG_CHR_DEV_SG=m
+# CONFIG_CHR_DEV_SCH is not set
+
+#
+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
+#
+# CONFIG_SCSI_MULTI_LUN is not set
+# CONFIG_SCSI_CONSTANTS is not set
+# CONFIG_SCSI_LOGGING is not set
+
+#
+# SCSI Transport Attributes
+#
+# CONFIG_SCSI_SPI_ATTRS is not set
+# CONFIG_SCSI_FC_ATTRS is not set
+# CONFIG_SCSI_ISCSI_ATTRS is not set
+# CONFIG_SCSI_SAS_ATTRS is not set
+
+#
+# SCSI low-level drivers
+#
+# CONFIG_ISCSI_TCP is not set
+# CONFIG_SCSI_SATA is not set
+# CONFIG_SCSI_DEBUG is not set
+
+#
+# PCMCIA SCSI adapter support
+#
+# CONFIG_PCMCIA_AHA152X is not set
+# CONFIG_PCMCIA_FDOMAIN is not set
+# CONFIG_PCMCIA_NINJA_SCSI is not set
+# CONFIG_PCMCIA_QLOGIC is not set
+# CONFIG_PCMCIA_SYM53C500 is not set
+
+#
+# Multi-device support (RAID and LVM)
+#
+# CONFIG_MD is not set
+
+#
+# Fusion MPT device support
+#
+# CONFIG_FUSION is not set
+
+#
+# IEEE 1394 (FireWire) support
+#
+
+#
+# I2O device support
+#
+
+#
+# Network device support
+#
+CONFIG_NETDEVICES=y
+# CONFIG_DUMMY is not set
+# CONFIG_BONDING is not set
+# CONFIG_EQUALIZER is not set
+CONFIG_TUN=m
+
+#
+# PHY device support
+#
+
+#
+# Ethernet (10 or 100Mbit)
+#
+# CONFIG_NET_ETHERNET is not set
+
+#
+# Ethernet (1000 Mbit)
+#
+
+#
+# Ethernet (10000 Mbit)
+#
+
+#
+# Token Ring devices
+#
+
+#
+# Wireless LAN (non-hamradio)
+#
+CONFIG_NET_RADIO=y
+
+#
+# Obsolete Wireless cards support (pre-802.11)
+#
+# CONFIG_STRIP is not set
+# CONFIG_PCMCIA_WAVELAN is not set
+# CONFIG_PCMCIA_NETWAVE is not set
+
+#
+# Wireless 802.11 Frequency Hopping cards support
+#
+# CONFIG_PCMCIA_RAYCS is not set
+
+#
+# Wireless 802.11b ISA/PCI cards support
+#
+# CONFIG_HERMES is not set
+# CONFIG_ATMEL is not set
+
+#
+# Wireless 802.11b Pcmcia/Cardbus cards support
+#
+# CONFIG_AIRO_CS is not set
+# CONFIG_PCMCIA_WL3501 is not set
+# CONFIG_HOSTAP is not set
+# CONFIG_ACX is not set
+CONFIG_NET_WIRELESS=y
+
+#
+# PCMCIA network device support
+#
+# CONFIG_NET_PCMCIA is not set
+
+#
+# Wan interfaces
+#
+# CONFIG_WAN is not set
+CONFIG_PPP=m
+CONFIG_PPP_MULTILINK=y
+CONFIG_PPP_FILTER=y
+CONFIG_PPP_ASYNC=m
+# CONFIG_PPP_SYNC_TTY is not set
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_BSDCOMP=m
+# CONFIG_PPP_MPPE is not set
+# CONFIG_PPPOE is not set
+# CONFIG_SLIP is not set
+# CONFIG_SHAPER is not set
+# CONFIG_NETCONSOLE is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
+
+#
+# ISDN subsystem
+#
+# CONFIG_ISDN is not set
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+
+#
+# Userland interfaces
+#
+# CONFIG_INPUT_MOUSEDEV is not set
+# CONFIG_INPUT_JOYDEV is not set
+CONFIG_INPUT_TSDEV=m
+CONFIG_INPUT_TSDEV_SCREEN_X=240
+CONFIG_INPUT_TSDEV_SCREEN_Y=320
+CONFIG_INPUT_EVDEV=y
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input Device Drivers
+#
+CONFIG_INPUT_KEYBOARD=y
+# CONFIG_KEYBOARD_ATKBD is not set
+# CONFIG_KEYBOARD_SUNKBD is not set
+# CONFIG_KEYBOARD_LKKBD is not set
+# CONFIG_KEYBOARD_XTKBD is not set
+CONFIG_KEYBOARD_NEWTON=m
+# CONFIG_INPUT_MOUSE is not set
+# CONFIG_INPUT_JOYSTICK is not set
+CONFIG_INPUT_TOUCHSCREEN=y
+# CONFIG_TOUCHSCREEN_GUNZE is not set
+# CONFIG_TOUCHSCREEN_ELO is not set
+# CONFIG_TOUCHSCREEN_MTOUCH is not set
+# CONFIG_TOUCHSCREEN_MK712 is not set
+# CONFIG_INPUT_MISC is not set
+
+#
+# Hardware I/O ports
+#
+CONFIG_SERIO=m
+CONFIG_SERIO_SERPORT=m
+# CONFIG_SERIO_LIBPS2 is not set
+# CONFIG_SERIO_RAW is not set
+# CONFIG_GAMEPORT is not set
+
+#
+# Character devices
+#
+CONFIG_VT=y
+CONFIG_VT_CONSOLE=y
+CONFIG_HW_CONSOLE=y
+# CONFIG_SERIAL_NONSTANDARD is not set
+
+#
+# Serial drivers
+#
+# CONFIG_SERIAL_8250 is not set
+
+#
+# Non-8250 serial port support
+#
+CONFIG_SERIAL_PXA=y
+CONFIG_SERIAL_PXA_CONSOLE=y
+CONFIG_SERIAL_PXA_COUNT=4
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+CONFIG_UNIX98_PTYS=y
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=256
+
+#
+# I2C support
+#
+CONFIG_I2C=y
+CONFIG_I2C_CHARDEV=y
+
+#
+# I2C Algorithms
+#
+# CONFIG_I2C_ALGOBIT is not set
+# CONFIG_I2C_ALGOPCF is not set
+# CONFIG_I2C_ALGOPCA is not set
+
+#
+# I2C Hardware Bus support
+#
+# CONFIG_I2C_ELV is not set
+CONFIG_I2C_PXA=y
+# CONFIG_I2C_PXA_SLAVE is not set
+# CONFIG_I2C_PARPORT_LIGHT is not set
+# CONFIG_I2C_STUB is not set
+# CONFIG_I2C_PCA_ISA is not set
+
+#
+# Miscellaneous I2C Chip support
+#
+# CONFIG_SENSORS_DS1337 is not set
+# CONFIG_SENSORS_DS1374 is not set
+# CONFIG_SENSORS_EEPROM is not set
+# CONFIG_SENSORS_PCF8574 is not set
+# CONFIG_SENSORS_PCA9539 is not set
+# CONFIG_SENSORS_PCA9535 is not set
+# CONFIG_SENSORS_PCF8591 is not set
+# CONFIG_SENSORS_RTC8564 is not set
+# CONFIG_SENSORS_MAX6875 is not set
+# CONFIG_RTC_X1205_I2C is not set
+# CONFIG_I2C_DEBUG_CORE is not set
+# CONFIG_I2C_DEBUG_ALGO is not set
+# CONFIG_I2C_DEBUG_BUS is not set
+# CONFIG_I2C_DEBUG_CHIP is not set
+
+#
+# L3 serial bus support
+#
+CONFIG_L3=m
+
+#
+# Mice
+#
+# CONFIG_BUSMOUSE is not set
+
+#
+# IPMI
+#
+# CONFIG_IPMI_HANDLER is not set
+
+#
+# Watchdog Cards
+#
+CONFIG_WATCHDOG=y
+# CONFIG_WATCHDOG_NOWAYOUT is not set
+
+#
+# Watchdog Device Drivers
+#
+# CONFIG_SOFT_WATCHDOG is not set
+# CONFIG_SA1100_WATCHDOG is not set
+
+#
+# USB-based Watchdog Cards
+#
+# CONFIG_USBPCWATCHDOG is not set
+# CONFIG_NVRAM is not set
+CONFIG_SA1100_RTC=y
+# CONFIG_DTLK is not set
+# CONFIG_R3964 is not set
+
+#
+# Ftape, the floppy tape device driver
+#
+
+#
+# PCMCIA character devices
+#
+# CONFIG_SYNCLINK_CS is not set
+# CONFIG_CARDMAN_4000 is not set
+# CONFIG_CARDMAN_4040 is not set
+# CONFIG_RAW_DRIVER is not set
+# CONFIG_H5400_BUZZER is not set
+
+#
+# TPM devices
+#
+# CONFIG_TCG_TPM is not set
+# CONFIG_TELCLOCK is not set
+
+#
+# SPI support
+#
+# CONFIG_SPI is not set
+# CONFIG_SPI_MASTER is not set
+
+#
+# Dallas's 1-wire bus
+#
+CONFIG_W1=y
+# CONFIG_W1_DS9490 is not set
+# CONFIG_W1_THERM is not set
+# CONFIG_W1_SMEM is not set
+# CONFIG_W1_DS2433 is not set
+CONFIG_W1_SAMCOP=y
+CONFIG_W1_DS2760=y
+
+#
+# Hardware Monitoring support
+#
+CONFIG_HWMON=y
+# CONFIG_HWMON_VID is not set
+# CONFIG_SENSORS_ADM1021 is not set
+# CONFIG_SENSORS_ADM1025 is not set
+# CONFIG_SENSORS_ADM1026 is not set
+# CONFIG_SENSORS_ADM1031 is not set
+# CONFIG_SENSORS_ADM9240 is not set
+# CONFIG_SENSORS_ASB100 is not set
+# CONFIG_SENSORS_ATXP1 is not set
+# CONFIG_SENSORS_DS1621 is not set
+# CONFIG_SENSORS_F71805F is not set
+# CONFIG_SENSORS_FSCHER is not set
+# CONFIG_SENSORS_FSCPOS is not set
+# CONFIG_SENSORS_GL518SM is not set
+# CONFIG_SENSORS_GL520SM is not set
+# CONFIG_SENSORS_IT87 is not set
+# CONFIG_SENSORS_LM63 is not set
+# CONFIG_SENSORS_LM75 is not set
+# CONFIG_SENSORS_LM77 is not set
+# CONFIG_SENSORS_LM78 is not set
+# CONFIG_SENSORS_LM80 is not set
+# CONFIG_SENSORS_LM83 is not set
+# CONFIG_SENSORS_LM85 is not set
+# CONFIG_SENSORS_LM87 is not set
+# CONFIG_SENSORS_LM90 is not set
+# CONFIG_SENSORS_LM92 is not set
+# CONFIG_SENSORS_MAX1619 is not set
+# CONFIG_SENSORS_PC87360 is not set
+# CONFIG_SENSORS_SMSC47M1 is not set
+# CONFIG_SENSORS_SMSC47B397 is not set
+# CONFIG_SENSORS_W83781D is not set
+# CONFIG_SENSORS_W83792D is not set
+# CONFIG_SENSORS_W83L785TS is not set
+# CONFIG_SENSORS_W83627HF is not set
+# CONFIG_SENSORS_W83627EHF is not set
+# CONFIG_HWMON_DEBUG_CHIP is not set
+
+#
+# SoC drivers
+#
+CONFIG_SOC_MQ11XX=y
+# CONFIG_SOC_T7L66XB is not set
+# CONFIG_SOC_TC6387XB is not set
+# CONFIG_SOC_TC6393XB is not set
+# CONFIG_HTC_ASIC2 is not set
+# CONFIG_HTC_ASIC3 is not set
+# CONFIG_SOC_TSC2101 is not set
+
+#
+# Misc devices
+#
+# CONFIG_BATTERY_MONITOR is not set
+
+#
+# Multimedia Capabilities Port drivers
+#
+# CONFIG_MCP is not set
+
+#
+# Multimedia Capabilities Port drivers
+#
+
+#
+# Multimedia devices
+#
+CONFIG_VIDEO_DEV=m
+
+#
+# Video For Linux
+#
+
+#
+# Video Adapters
+#
+# CONFIG_VIDEO_ADV_DEBUG is not set
+CONFIG_VIDEO_CPIA=m
+# CONFIG_VIDEO_CPIA_USB is not set
+# CONFIG_VIDEO_SAA5246A is not set
+# CONFIG_VIDEO_SAA5249 is not set
+# CONFIG_TUNER_3036 is not set
+# CONFIG_VIDEO_EM28XX is not set
+# CONFIG_VIDEO_OVCAMCHIP is not set
+# CONFIG_VIDEO_AUDIO_DECODER is not set
+# CONFIG_VIDEO_DECODER is not set
+
+#
+# Radio Adapters
+#
+# CONFIG_RADIO_MAESTRO is not set
+
+#
+# Digital Video Broadcasting Devices
+#
+# CONFIG_DVB is not set
+
+#
+# Graphics support
+#
+CONFIG_FB=y
+CONFIG_FB_CFB_FILLRECT=m
+CONFIG_FB_CFB_COPYAREA=m
+CONFIG_FB_CFB_IMAGEBLIT=m
+# CONFIG_FB_MACMODES is not set
+# CONFIG_FB_MODE_HELPERS is not set
+# CONFIG_FB_TILEBLITTING is not set
+# CONFIG_FB_IMAGEON is not set
+# CONFIG_FB_S1D13XXX is not set
+CONFIG_FB_PXA=m
+# CONFIG_FB_PXA_PARAMETERS is not set
+CONFIG_FB_MQ1100=m
+# CONFIG_FB_VIRTUAL is not set
+
+#
+# Console display driver support
+#
+# CONFIG_VGA_CONSOLE is not set
+CONFIG_DUMMY_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE=m
+# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
+CONFIG_FONTS=y
+# CONFIG_FONT_8x8 is not set
+# CONFIG_FONT_8x16 is not set
+# CONFIG_FONT_6x11 is not set
+# CONFIG_FONT_7x14 is not set
+# CONFIG_FONT_PEARL_8x8 is not set
+# CONFIG_FONT_ACORN_8x8 is not set
+CONFIG_FONT_MINI_4x6=y
+# CONFIG_FONT_SUN8x16 is not set
+# CONFIG_FONT_SUN12x22 is not set
+# CONFIG_FONT_10x18 is not set
+
+#
+# Logo configuration
+#
+# CONFIG_LOGO is not set
+CONFIG_BACKLIGHT_LCD_SUPPORT=y
+CONFIG_BACKLIGHT_CLASS_DEVICE=m
+CONFIG_BACKLIGHT_DEVICE=y
+CONFIG_LCD_CLASS_DEVICE=m
+CONFIG_LCD_DEVICE=y
+
+#
+# Sound
+#
+# CONFIG_SOUND is not set
+
+#
+# USB support
+#
+CONFIG_USB_ARCH_HAS_HCD=y
+# CONFIG_USB_ARCH_HAS_OHCI is not set
+CONFIG_USB=m
+# CONFIG_USB_DEBUG is not set
+
+#
+# Miscellaneous USB options
+#
+CONFIG_USB_DEVICEFS=y
+# CONFIG_USB_BANDWIDTH is not set
+# CONFIG_USB_DYNAMIC_MINORS is not set
+# CONFIG_USB_SUSPEND is not set
+# CONFIG_USB_OTG is not set
+
+#
+# USB Host Controller Drivers
+#
+# CONFIG_USB_ISP116X_HCD is not set
+CONFIG_USB_SL811_HCD=m
+CONFIG_USB_SL811_CS=m
+
+#
+# USB Device Class drivers
+#
+# CONFIG_USB_ACM is not set
+# CONFIG_USB_PRINTER is not set
+
+#
+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
+#
+
+#
+# may also be needed; see USB_STORAGE Help for more information
+#
+# CONFIG_USB_STORAGE is not set
+# CONFIG_USB_LIBUSUAL is not set
+
+#
+# USB Input Devices
+#
+# CONFIG_USB_HID is not set
+
+#
+# USB HID Boot Protocol drivers
+#
+# CONFIG_USB_KBD is not set
+# CONFIG_USB_MOUSE is not set
+# CONFIG_USB_AIPTEK is not set
+# CONFIG_USB_WACOM is not set
+# CONFIG_USB_ACECAD is not set
+# CONFIG_USB_KBTAB is not set
+# CONFIG_USB_POWERMATE is not set
+# CONFIG_USB_MTOUCH is not set
+# CONFIG_USB_ITMTOUCH is not set
+# CONFIG_USB_EGALAX is not set
+# CONFIG_USB_YEALINK is not set
+# CONFIG_USB_XPAD is not set
+# CONFIG_USB_ATI_REMOTE is not set
+# CONFIG_USB_ATI_REMOTE2 is not set
+# CONFIG_USB_KEYSPAN_REMOTE is not set
+# CONFIG_USB_APPLETOUCH is not set
+
+#
+# USB Imaging devices
+#
+# CONFIG_USB_MDC800 is not set
+# CONFIG_USB_MICROTEK is not set
+
+#
+# USB Multimedia devices
+#
+# CONFIG_USB_DABUSB is not set
+# CONFIG_USB_VICAM is not set
+# CONFIG_USB_DSBR is not set
+# CONFIG_USB_ET61X251 is not set
+# CONFIG_USB_IBMCAM is not set
+# CONFIG_USB_KONICAWC is not set
+# CONFIG_USB_OV511 is not set
+# CONFIG_USB_SE401 is not set
+# CONFIG_USB_SN9C102 is not set
+# CONFIG_USB_STV680 is not set
+# CONFIG_USB_PWC is not set
+
+#
+# USB Network Adapters
+#
+# CONFIG_USB_CATC is not set
+# CONFIG_USB_KAWETH is not set
+# CONFIG_USB_PEGASUS is not set
+# CONFIG_USB_RTL8150 is not set
+# CONFIG_USB_USBNET is not set
+# CONFIG_USB_ZD1201 is not set
+CONFIG_USB_MON=y
+
+#
+# USB port drivers
+#
+
+#
+# USB Serial Converter support
+#
+# CONFIG_USB_SERIAL is not set
+
+#
+# USB Miscellaneous drivers
+#
+# CONFIG_USB_EMI62 is not set
+# CONFIG_USB_EMI26 is not set
+# CONFIG_USB_AUERSWALD is not set
+# CONFIG_USB_RIO500 is not set
+# CONFIG_USB_LEGOTOWER is not set
+# CONFIG_USB_LCD is not set
+# CONFIG_USB_LED is not set
+# CONFIG_USB_CYTHERM is not set
+# CONFIG_USB_PHIDGETKIT is not set
+# CONFIG_USB_PHIDGETSERVO is not set
+# CONFIG_USB_IDMOUSE is not set
+# CONFIG_USB_LD is not set
+# CONFIG_USB_TEST is not set
+
+#
+# USB DSL modem support
+#
+
+#
+# USB Gadget Support
+#
+CONFIG_USB_GADGET=y
+# CONFIG_USB_GADGET_DEBUG_FILES is not set
+CONFIG_USB_GADGET_SELECTED=y
+# CONFIG_USB_GADGET_NET2280 is not set
+CONFIG_USB_GADGET_PXA2XX=y
+CONFIG_USB_PXA2XX=y
+CONFIG_USB_PXA2XX_SMALL=y
+# CONFIG_USB_GADGET_PXA27X is not set
+# CONFIG_USB_GADGET_GOKU is not set
+# CONFIG_USB_GADGET_MQ11XX is not set
+# CONFIG_USB_GADGET_LH7A40X is not set
+# CONFIG_USB_GADGET_OMAP is not set
+# CONFIG_USB_GADGET_DUMMY_HCD is not set
+# CONFIG_USB_GADGET_DUALSPEED is not set
+# CONFIG_USB_ZERO is not set
+CONFIG_USB_ETH=y
+# CONFIG_USB_ETH_RNDIS is not set
+# CONFIG_USB_GADGETFS is not set
+# CONFIG_USB_FILE_STORAGE is not set
+# CONFIG_USB_G_SERIAL is not set
+# CONFIG_USB_G_CHAR is not set
+
+#
+# MMC/SD Card support
+#
+CONFIG_MMC=y
+# CONFIG_MMC_DEBUG is not set
+CONFIG_MMC_BLOCK=y
+CONFIG_MMC_PXA=m
+# CONFIG_MMC_TMIO is not set
+CONFIG_MMC_SAMCOP=y
+# CONFIG_MMC_ASIC3 is not set
+
+#
+# LED devices
+#
+CONFIG_CLASS_LEDS=y
+
+#
+# File systems
+#
+CONFIG_EXT2_FS=y
+# CONFIG_EXT2_FS_XATTR is not set
+# CONFIG_EXT2_FS_XIP is not set
+CONFIG_EXT3_FS=m
+CONFIG_EXT3_FS_XATTR=y
+# CONFIG_EXT3_FS_POSIX_ACL is not set
+# CONFIG_EXT3_FS_SECURITY is not set
+CONFIG_JBD=m
+# CONFIG_JBD_DEBUG is not set
+CONFIG_FS_MBCACHE=y
+CONFIG_REISERFS_FS=m
+# CONFIG_REISERFS_CHECK is not set
+# CONFIG_REISERFS_PROC_INFO is not set
+# CONFIG_REISERFS_FS_XATTR is not set
+# CONFIG_JFS_FS is not set
+# CONFIG_FS_POSIX_ACL is not set
+# CONFIG_XFS_FS is not set
+# CONFIG_OCFS2_FS is not set
+# CONFIG_MINIX_FS is not set
+CONFIG_ROMFS_FS=m
+CONFIG_INOTIFY=y
+# CONFIG_QUOTA is not set
+CONFIG_DNOTIFY=y
+# CONFIG_AUTOFS_FS is not set
+CONFIG_AUTOFS4_FS=m
+# CONFIG_FUSE_FS is not set
+
+#
+# CD-ROM/DVD Filesystems
+#
+CONFIG_ISO9660_FS=m
+CONFIG_JOLIET=y
+# CONFIG_ZISOFS is not set
+# CONFIG_UDF_FS is not set
+
+#
+# DOS/FAT/NT Filesystems
+#
+CONFIG_FAT_FS=m
+CONFIG_MSDOS_FS=m
+CONFIG_VFAT_FS=m
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+# CONFIG_NTFS_FS is not set
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+# CONFIG_HUGETLB_PAGE is not set
+CONFIG_RAMFS=y
+# CONFIG_RELAYFS_FS is not set
+# CONFIG_CONFIGFS_FS is not set
+
+#
+# Miscellaneous filesystems
+#
+# CONFIG_ADFS_FS is not set
+# CONFIG_AFFS_FS is not set
+# CONFIG_HFS_FS is not set
+# CONFIG_HFSPLUS_FS is not set
+# CONFIG_BEFS_FS is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_EFS_FS is not set
+# CONFIG_JFFS_FS is not set
+CONFIG_JFFS2_FS=y
+CONFIG_JFFS2_FS_DEBUG=0
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+# CONFIG_JFFS2_SUMMARY is not set
+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
+CONFIG_JFFS2_ZLIB=y
+CONFIG_JFFS2_RTIME=y
+# CONFIG_JFFS2_RUBIN is not set
+CONFIG_CRAMFS=m
+# CONFIG_VXFS_FS is not set
+# CONFIG_HPFS_FS is not set
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_SYSV_FS is not set
+# CONFIG_UFS_FS is not set
+
+#
+# Network File Systems
+#
+CONFIG_NFS_FS=m
+CONFIG_NFS_V3=y
+# CONFIG_NFS_V3_ACL is not set
+# CONFIG_NFS_V4 is not set
+# CONFIG_NFS_DIRECTIO is not set
+CONFIG_NFSD=m
+CONFIG_NFSD_V3=y
+# CONFIG_NFSD_V3_ACL is not set
+# CONFIG_NFSD_V4 is not set
+# CONFIG_NFSD_TCP is not set
+CONFIG_LOCKD=m
+CONFIG_LOCKD_V4=y
+CONFIG_EXPORTFS=m
+CONFIG_NFS_COMMON=y
+CONFIG_SUNRPC=m
+# CONFIG_RPCSEC_GSS_KRB5 is not set
+# CONFIG_RPCSEC_GSS_SPKM3 is not set
+CONFIG_SMB_FS=m
+# CONFIG_SMB_NLS_DEFAULT is not set
+# CONFIG_CIFS is not set
+# CONFIG_NCP_FS is not set
+# CONFIG_CODA_FS is not set
+# CONFIG_AFS_FS is not set
+# CONFIG_9P_FS is not set
+
+#
+# Partition Types
+#
+# CONFIG_PARTITION_ADVANCED is not set
+CONFIG_MSDOS_PARTITION=y
+
+#
+# Native Language Support
+#
+CONFIG_NLS=m
+CONFIG_NLS_DEFAULT="iso8859-1"
+CONFIG_NLS_CODEPAGE_437=m
+CONFIG_NLS_CODEPAGE_737=m
+CONFIG_NLS_CODEPAGE_775=m
+CONFIG_NLS_CODEPAGE_850=m
+CONFIG_NLS_CODEPAGE_852=m
+CONFIG_NLS_CODEPAGE_855=m
+CONFIG_NLS_CODEPAGE_857=m
+CONFIG_NLS_CODEPAGE_860=m
+CONFIG_NLS_CODEPAGE_861=m
+CONFIG_NLS_CODEPAGE_862=m
+CONFIG_NLS_CODEPAGE_863=m
+CONFIG_NLS_CODEPAGE_864=m
+CONFIG_NLS_CODEPAGE_865=m
+CONFIG_NLS_CODEPAGE_866=m
+CONFIG_NLS_CODEPAGE_869=m
+CONFIG_NLS_CODEPAGE_936=m
+CONFIG_NLS_CODEPAGE_950=m
+CONFIG_NLS_CODEPAGE_932=m
+CONFIG_NLS_CODEPAGE_949=m
+CONFIG_NLS_CODEPAGE_874=m
+CONFIG_NLS_ISO8859_8=m
+CONFIG_NLS_CODEPAGE_1250=m
+CONFIG_NLS_CODEPAGE_1251=m
+# CONFIG_NLS_ASCII is not set
+CONFIG_NLS_ISO8859_1=m
+CONFIG_NLS_ISO8859_2=m
+CONFIG_NLS_ISO8859_3=m
+CONFIG_NLS_ISO8859_4=m
+CONFIG_NLS_ISO8859_5=m
+CONFIG_NLS_ISO8859_6=m
+CONFIG_NLS_ISO8859_7=m
+CONFIG_NLS_ISO8859_9=m
+CONFIG_NLS_ISO8859_13=m
+CONFIG_NLS_ISO8859_14=m
+CONFIG_NLS_ISO8859_15=m
+CONFIG_NLS_KOI8_R=m
+CONFIG_NLS_KOI8_U=m
+CONFIG_NLS_UTF8=m
+
+#
+# Profiling support
+#
+# CONFIG_PROFILING is not set
+
+#
+# Kernel hacking
+#
+# CONFIG_PRINTK_TIME is not set
+# CONFIG_MAGIC_SYSRQ is not set
+CONFIG_DEBUG_KERNEL=y
+CONFIG_LOG_BUF_SHIFT=14
+CONFIG_DETECT_SOFTLOCKUP=y
+# CONFIG_SCHEDSTATS is not set
+# CONFIG_DEBUG_SLAB is not set
+CONFIG_DEBUG_PREEMPT=y
+CONFIG_DEBUG_MUTEXES=y
+# CONFIG_DEBUG_SPINLOCK is not set
+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
+# CONFIG_DEBUG_KOBJECT is not set
+# CONFIG_DEBUG_BUGVERBOSE is not set
+# CONFIG_DEBUG_INFO is not set
+# CONFIG_DEBUG_FS is not set
+# CONFIG_DEBUG_VM is not set
+CONFIG_FRAME_POINTER=y
+CONFIG_FORCED_INLINING=y
+# CONFIG_RCU_TORTURE_TEST is not set
+# CONFIG_DEBUG_USER is not set
+# CONFIG_DEBUG_WAITQ is not set
+CONFIG_DEBUG_ERRORS=y
+# CONFIG_DEBUG_LL is not set
+
+#
+# Security options
+#
+# CONFIG_KEYS is not set
+# CONFIG_SECURITY is not set
+
+#
+# Cryptographic options
+#
+CONFIG_CRYPTO=y
+CONFIG_CRYPTO_HMAC=y
+CONFIG_CRYPTO_NULL=m
+CONFIG_CRYPTO_MD4=m
+CONFIG_CRYPTO_MD5=m
+CONFIG_CRYPTO_SHA1=m
+CONFIG_CRYPTO_SHA256=m
+CONFIG_CRYPTO_SHA512=m
+# CONFIG_CRYPTO_WP512 is not set
+# CONFIG_CRYPTO_TGR192 is not set
+CONFIG_CRYPTO_DES=m
+CONFIG_CRYPTO_BLOWFISH=m
+CONFIG_CRYPTO_TWOFISH=m
+CONFIG_CRYPTO_SERPENT=m
+CONFIG_CRYPTO_AES=m
+CONFIG_CRYPTO_CAST5=m
+CONFIG_CRYPTO_CAST6=m
+# CONFIG_CRYPTO_TEA is not set
+CONFIG_CRYPTO_ARC4=m
+# CONFIG_CRYPTO_KHAZAD is not set
+# CONFIG_CRYPTO_ANUBIS is not set
+CONFIG_CRYPTO_DEFLATE=y
+CONFIG_CRYPTO_MICHAEL_MIC=m
+CONFIG_CRYPTO_CRC32C=m
+# CONFIG_CRYPTO_TEST is not set
+
+#
+# Hardware crypto devices
+#
+
+#
+# Library routines
+#
+CONFIG_CRC_CCITT=m
+# CONFIG_CRC16 is not set
+CONFIG_CRC32=y
+CONFIG_LIBCRC32C=m
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=y
diff --git a/packages/linux/handhelds-pxa-2.6/ipaq-pxa270/defconfig b/packages/linux/handhelds-pxa-2.6/ipaq-pxa270/defconfig
index bcd904c6c6..da28b781af 100644
--- a/packages/linux/handhelds-pxa-2.6/ipaq-pxa270/defconfig
+++ b/packages/linux/handhelds-pxa-2.6/ipaq-pxa270/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.16-hh0
-# Thu May 11 11:50:06 2006
+# Linux kernel version: 2.6.16-hh5
+# Thu Aug 10 16:39:20 2006
 #
 CONFIG_ARM=y
 CONFIG_MMU=y
@@ -137,6 +137,12 @@ CONFIG_HX4700_LEDS=y
 # CONFIG_MACH_HX2750 is not set
 # CONFIG_ARCH_H5400 is not set
 # CONFIG_MACH_HIMALAYA is not set
+# CONFIG_MACH_HTCUNIVERSAL is not set
+# CONFIG_MACH_HTCALPINE is not set
+# CONFIG_MACH_MAGICIAN is not set
+# CONFIG_MACH_HTCAPACHE is not set
+# CONFIG_MACH_BLUEANGEL is not set
+# CONFIG_MACH_HTCBEETLES is not set
 # CONFIG_ARCH_AXIMX5 is not set
 # CONFIG_ARCH_AXIMX3 is not set
 # CONFIG_MACH_X30 is not set
@@ -146,6 +152,7 @@ CONFIG_HX4700_LEDS=y
 # CONFIG_MACH_T3XSCALE is not set
 # CONFIG_PXA_SHARPSL is not set
 CONFIG_PXA27x=y
+CONFIG_IWMMXT=y
 # CONFIG_SA1100_H3100 is not set
 # CONFIG_SA1100_H3600 is not set
 # CONFIG_SA1100_H3800 is not set
@@ -217,7 +224,8 @@ CONFIG_PCMCIA_PXA2XX=y
 #
 CONFIG_PREEMPT=y
 # CONFIG_NO_IDLE_HZ is not set
-# CONFIG_AEABI is not set
+CONFIG_AEABI=y
+CONFIG_OABI_COMPAT=y
 # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
 CONFIG_SELECT_MEMORY_MODEL=y
 CONFIG_FLATMEM_MANUAL=y
@@ -250,8 +258,8 @@ CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y
 CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
 CONFIG_CPU_FREQ_GOV_POWERSAVE=m
 CONFIG_CPU_FREQ_GOV_USERSPACE=y
-CONFIG_CPU_FREQ_GOV_ONDEMAND=m
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
+# CONFIG_CPU_FREQ_GOV_ONDEMAND is not set
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
 CONFIG_CPU_FREQ_PXA=y
 CONFIG_PXA25x_ALTERNATE_FREQS=y
 
@@ -272,7 +280,6 @@ CONFIG_FPE_NWFPE=y
 CONFIG_BINFMT_ELF=y
 # CONFIG_BINFMT_AOUT is not set
 # CONFIG_BINFMT_MISC is not set
-# CONFIG_ARTHUR is not set
 
 #
 # Power management options
@@ -291,7 +298,7 @@ CONFIG_NET=y
 # Networking options
 #
 # CONFIG_NETDEBUG is not set
-CONFIG_PACKET=m
+CONFIG_PACKET=y
 CONFIG_PACKET_MMAP=y
 CONFIG_UNIX=y
 CONFIG_XFRM=y
@@ -602,15 +609,18 @@ CONFIG_BLK_DEV_LOOP=m
 CONFIG_BLK_DEV_CRYPTOLOOP=m
 CONFIG_BLK_DEV_NBD=m
 # CONFIG_BLK_DEV_UB is not set
-# CONFIG_BLK_DEV_RAM is not set
+CONFIG_BLK_DEV_RAM=m
 CONFIG_BLK_DEV_RAM_COUNT=16
-# CONFIG_CDROM_PKTCDVD is not set
-# CONFIG_ATA_OVER_ETH is not set
+CONFIG_BLK_DEV_RAM_SIZE=4096
+CONFIG_CDROM_PKTCDVD=m
+CONFIG_CDROM_PKTCDVD_BUFFERS=8
+# CONFIG_CDROM_PKTCDVD_WCACHE is not set
+CONFIG_ATA_OVER_ETH=m
 
 #
 # ATA/ATAPI/MFM/RLL support
 #
-CONFIG_IDE=m
+CONFIG_IDE=y
 CONFIG_BLK_DEV_IDE=m
 
 #
@@ -718,6 +728,7 @@ CONFIG_TUN=m
 # Ethernet (10 or 100Mbit)
 #
 # CONFIG_NET_ETHERNET is not set
+CONFIG_MII=m
 
 #
 # Ethernet (1000 Mbit)
@@ -822,7 +833,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
 # CONFIG_INPUT_JOYDEV is not set
 # CONFIG_INPUT_TSDEV is not set
-CONFIG_INPUT_EVDEV=m
+CONFIG_INPUT_EVDEV=y
 # CONFIG_INPUT_EVBUG is not set
 
 #
@@ -1140,19 +1151,19 @@ CONFIG_LCD_DEVICE=y
 #
 # Sound
 #
-CONFIG_SOUND=m
+CONFIG_SOUND=y
 
 #
 # Advanced Linux Sound Architecture
 #
-CONFIG_SND=m
+CONFIG_SND=y
 CONFIG_SND_TIMER=m
 CONFIG_SND_PCM=m
 # CONFIG_SND_SEQUENCER is not set
 CONFIG_SND_OSSEMUL=y
 CONFIG_SND_MIXER_OSS=m
 CONFIG_SND_PCM_OSS=m
-# CONFIG_SND_DYNAMIC_MINORS is not set
+CONFIG_SND_DYNAMIC_MINORS=y
 CONFIG_SND_SUPPORT_OLD_API=y
 # CONFIG_SND_VERBOSE_PRINTK is not set
 # CONFIG_SND_DEBUG is not set
@@ -1171,7 +1182,9 @@ CONFIG_SND_SUPPORT_OLD_API=y
 # CONFIG_SND_A716 is not set
 # CONFIG_SND_H1910 is not set
 # CONFIG_SND_H2200 is not set
+# CONFIG_SND_HTCMAGICIAN is not set
 CONFIG_SND_HX4700=m
+# CONFIG_SND_HTCUNIVERSAL is not set
 # CONFIG_SND_H5XXX_AK4535 is not set
 CONFIG_SND_PXA2xx_I2SOUND=m
 # CONFIG_SND_PXA2XX_AC97 is not set
@@ -1291,19 +1304,31 @@ CONFIG_USB_MOUSE=m
 # CONFIG_USB_KONICAWC is not set
 # CONFIG_USB_OV511 is not set
 # CONFIG_USB_SE401 is not set
-# CONFIG_USB_SN9C102 is not set
+CONFIG_USB_SN9C102=m
 # CONFIG_USB_STV680 is not set
 # CONFIG_USB_PWC is not set
 
 #
 # USB Network Adapters
 #
-# CONFIG_USB_CATC is not set
-# CONFIG_USB_KAWETH is not set
-# CONFIG_USB_PEGASUS is not set
-# CONFIG_USB_RTL8150 is not set
-# CONFIG_USB_USBNET is not set
-# CONFIG_USB_ZD1201 is not set
+CONFIG_USB_CATC=m
+CONFIG_USB_KAWETH=m
+CONFIG_USB_PEGASUS=m
+CONFIG_USB_RTL8150=m
+CONFIG_USB_USBNET=m
+CONFIG_USB_NET_CDCETHER=m
+# CONFIG_USB_NET_GL620A is not set
+CONFIG_USB_NET_NET1080=m
+# CONFIG_USB_NET_PLUSB is not set
+# CONFIG_USB_NET_RNDIS_HOST is not set
+CONFIG_USB_NET_CDC_SUBSET=m
+# CONFIG_USB_ALI_M5632 is not set
+# CONFIG_USB_AN2720 is not set
+CONFIG_USB_BELKIN=y
+CONFIG_USB_ARMLINUX=y
+# CONFIG_USB_EPSON2888 is not set
+CONFIG_USB_NET_ZAURUS=m
+CONFIG_USB_ZD1201=m
 CONFIG_USB_MON=y
 
 #
@@ -1385,17 +1410,33 @@ CONFIG_EXT2_FS_XATTR=y
 CONFIG_EXT2_FS_POSIX_ACL=y
 # CONFIG_EXT2_FS_SECURITY is not set
 # CONFIG_EXT2_FS_XIP is not set
-# CONFIG_EXT3_FS is not set
+CONFIG_EXT3_FS=m
+CONFIG_EXT3_FS_XATTR=y
+# CONFIG_EXT3_FS_POSIX_ACL is not set
+# CONFIG_EXT3_FS_SECURITY is not set
+CONFIG_JBD=m
+# CONFIG_JBD_DEBUG is not set
 CONFIG_FS_MBCACHE=m
-# CONFIG_REISERFS_FS is not set
+CONFIG_REISERFS_FS=m
+# CONFIG_REISERFS_CHECK is not set
+CONFIG_REISERFS_PROC_INFO=y
+CONFIG_REISERFS_FS_XATTR=y
+# CONFIG_REISERFS_FS_POSIX_ACL is not set
+# CONFIG_REISERFS_FS_SECURITY is not set
 # CONFIG_JFS_FS is not set
 CONFIG_FS_POSIX_ACL=y
-# CONFIG_XFS_FS is not set
+CONFIG_XFS_FS=m
+CONFIG_XFS_EXPORT=y
+CONFIG_XFS_QUOTA=y
+CONFIG_XFS_SECURITY=y
+CONFIG_XFS_POSIX_ACL=y
+CONFIG_XFS_RT=y
 # CONFIG_OCFS2_FS is not set
 # CONFIG_MINIX_FS is not set
 CONFIG_ROMFS_FS=m
 CONFIG_INOTIFY=y
 # CONFIG_QUOTA is not set
+CONFIG_QUOTACTL=y
 CONFIG_DNOTIFY=y
 # CONFIG_AUTOFS_FS is not set
 # CONFIG_AUTOFS4_FS is not set
@@ -1404,7 +1445,10 @@ CONFIG_DNOTIFY=y
 #
 # CD-ROM/DVD Filesystems
 #
-# CONFIG_ISO9660_FS is not set
+CONFIG_ISO9660_FS=m
+CONFIG_JOLIET=y
+CONFIG_ZISOFS=y
+CONFIG_ZISOFS_FS=m
 CONFIG_UDF_FS=m
 CONFIG_UDF_NLS=y
 
@@ -1416,7 +1460,9 @@ CONFIG_MSDOS_FS=m
 CONFIG_VFAT_FS=m
 CONFIG_FAT_DEFAULT_CODEPAGE=437
 CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
-# CONFIG_NTFS_FS is not set
+CONFIG_NTFS_FS=m
+# CONFIG_NTFS_DEBUG is not set
+# CONFIG_NTFS_RW is not set
 
 #
 # Pseudo filesystems
@@ -1426,8 +1472,8 @@ CONFIG_SYSFS=y
 CONFIG_TMPFS=y
 # CONFIG_HUGETLB_PAGE is not set
 CONFIG_RAMFS=y
-# CONFIG_RELAYFS_FS is not set
-# CONFIG_CONFIGFS_FS is not set
+CONFIG_RELAYFS_FS=m
+CONFIG_CONFIGFS_FS=m
 
 #
 # Miscellaneous filesystems
@@ -1435,14 +1481,14 @@ CONFIG_RAMFS=y
 # CONFIG_ADFS_FS is not set
 # CONFIG_AFFS_FS is not set
 # CONFIG_HFS_FS is not set
-# CONFIG_HFSPLUS_FS is not set
+CONFIG_HFSPLUS_FS=m
 # CONFIG_BEFS_FS is not set
 # CONFIG_BFS_FS is not set
 # CONFIG_EFS_FS is not set
 # CONFIG_JFFS_FS is not set
 CONFIG_JFFS2_FS=y
 CONFIG_JFFS2_FS_DEBUG=0
-# CONFIG_JFFS2_FS_WRITEBUFFER is not set
+CONFIG_JFFS2_FS_WRITEBUFFER=y
 CONFIG_JFFS2_SUMMARY=y
 CONFIG_JFFS2_COMPRESSION_OPTIONS=y
 CONFIG_JFFS2_ZLIB=y
@@ -1461,14 +1507,38 @@ CONFIG_CRAMFS=m
 #
 # Network File Systems
 #
-# CONFIG_NFS_FS is not set
-# CONFIG_NFSD is not set
-# CONFIG_SMB_FS is not set
-# CONFIG_CIFS is not set
+CONFIG_NFS_FS=m
+CONFIG_NFS_V3=y
+CONFIG_NFS_V3_ACL=y
+CONFIG_NFS_V4=y
+CONFIG_NFS_DIRECTIO=y
+CONFIG_NFSD=m
+CONFIG_NFSD_V2_ACL=y
+CONFIG_NFSD_V3=y
+CONFIG_NFSD_V3_ACL=y
+CONFIG_NFSD_V4=y
+CONFIG_NFSD_TCP=y
+CONFIG_LOCKD=m
+CONFIG_LOCKD_V4=y
+CONFIG_EXPORTFS=m
+CONFIG_NFS_ACL_SUPPORT=m
+CONFIG_NFS_COMMON=y
+CONFIG_SUNRPC=m
+CONFIG_SUNRPC_GSS=m
+CONFIG_RPCSEC_GSS_KRB5=m
+# CONFIG_RPCSEC_GSS_SPKM3 is not set
+CONFIG_SMB_FS=m
+CONFIG_SMB_NLS_DEFAULT=y
+CONFIG_SMB_NLS_REMOTE="cp437"
+CONFIG_CIFS=m
+# CONFIG_CIFS_STATS is not set
+CONFIG_CIFS_XATTR=y
+CONFIG_CIFS_POSIX=y
+# CONFIG_CIFS_EXPERIMENTAL is not set
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set
-# CONFIG_9P_FS is not set
+CONFIG_9P_FS=m
 
 #
 # Partition Types
@@ -1494,46 +1564,46 @@ CONFIG_MSDOS_PARTITION=y
 #
 # Native Language Support
 #
-CONFIG_NLS=m
+CONFIG_NLS=y
 CONFIG_NLS_DEFAULT="utf8"
-CONFIG_NLS_CODEPAGE_437=m
-# CONFIG_NLS_CODEPAGE_737 is not set
-# CONFIG_NLS_CODEPAGE_775 is not set
+CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_CODEPAGE_737=m
+CONFIG_NLS_CODEPAGE_775=m
 CONFIG_NLS_CODEPAGE_850=m
-# CONFIG_NLS_CODEPAGE_852 is not set
-# CONFIG_NLS_CODEPAGE_855 is not set
-# CONFIG_NLS_CODEPAGE_857 is not set
-# CONFIG_NLS_CODEPAGE_860 is not set
-# CONFIG_NLS_CODEPAGE_861 is not set
-# CONFIG_NLS_CODEPAGE_862 is not set
-# CONFIG_NLS_CODEPAGE_863 is not set
-# CONFIG_NLS_CODEPAGE_864 is not set
-# CONFIG_NLS_CODEPAGE_865 is not set
-# CONFIG_NLS_CODEPAGE_866 is not set
-# CONFIG_NLS_CODEPAGE_869 is not set
-# CONFIG_NLS_CODEPAGE_936 is not set
-# CONFIG_NLS_CODEPAGE_950 is not set
+CONFIG_NLS_CODEPAGE_852=m
+CONFIG_NLS_CODEPAGE_855=m
+CONFIG_NLS_CODEPAGE_857=m
+CONFIG_NLS_CODEPAGE_860=m
+CONFIG_NLS_CODEPAGE_861=m
+CONFIG_NLS_CODEPAGE_862=m
+CONFIG_NLS_CODEPAGE_863=m
+CONFIG_NLS_CODEPAGE_864=m
+CONFIG_NLS_CODEPAGE_865=m
+CONFIG_NLS_CODEPAGE_866=m
+CONFIG_NLS_CODEPAGE_869=m
+CONFIG_NLS_CODEPAGE_936=m
+CONFIG_NLS_CODEPAGE_950=m
 CONFIG_NLS_CODEPAGE_932=m
-# CONFIG_NLS_CODEPAGE_949 is not set
-# CONFIG_NLS_CODEPAGE_874 is not set
-# CONFIG_NLS_ISO8859_8 is not set
-# CONFIG_NLS_CODEPAGE_1250 is not set
-# CONFIG_NLS_CODEPAGE_1251 is not set
-# CONFIG_NLS_ASCII is not set
-CONFIG_NLS_ISO8859_1=m
-# CONFIG_NLS_ISO8859_2 is not set
-# CONFIG_NLS_ISO8859_3 is not set
-# CONFIG_NLS_ISO8859_4 is not set
-# CONFIG_NLS_ISO8859_5 is not set
-# CONFIG_NLS_ISO8859_6 is not set
-# CONFIG_NLS_ISO8859_7 is not set
-# CONFIG_NLS_ISO8859_9 is not set
-# CONFIG_NLS_ISO8859_13 is not set
-# CONFIG_NLS_ISO8859_14 is not set
+CONFIG_NLS_CODEPAGE_949=m
+CONFIG_NLS_CODEPAGE_874=m
+CONFIG_NLS_ISO8859_8=m
+CONFIG_NLS_CODEPAGE_1250=m
+CONFIG_NLS_CODEPAGE_1251=m
+CONFIG_NLS_ASCII=m
+CONFIG_NLS_ISO8859_1=y
+CONFIG_NLS_ISO8859_2=m
+CONFIG_NLS_ISO8859_3=m
+CONFIG_NLS_ISO8859_4=m
+CONFIG_NLS_ISO8859_5=m
+CONFIG_NLS_ISO8859_6=m
+CONFIG_NLS_ISO8859_7=m
+CONFIG_NLS_ISO8859_9=m
+CONFIG_NLS_ISO8859_13=m
+CONFIG_NLS_ISO8859_14=m
 CONFIG_NLS_ISO8859_15=m
-# CONFIG_NLS_KOI8_R is not set
-# CONFIG_NLS_KOI8_U is not set
-CONFIG_NLS_UTF8=m
+CONFIG_NLS_KOI8_R=m
+CONFIG_NLS_KOI8_U=m
+CONFIG_NLS_UTF8=y
 
 #
 # Profiling support
@@ -1580,7 +1650,7 @@ CONFIG_CRYPTO=y
 CONFIG_CRYPTO_HMAC=y
 CONFIG_CRYPTO_NULL=m
 CONFIG_CRYPTO_MD4=m
-CONFIG_CRYPTO_MD5=m
+CONFIG_CRYPTO_MD5=y
 CONFIG_CRYPTO_SHA1=m
 CONFIG_CRYPTO_SHA256=m
 CONFIG_CRYPTO_SHA512=m
diff --git a/packages/linux/handhelds-pxa-2.6_cvs.bb b/packages/linux/handhelds-pxa-2.6_cvs.bb
index 0273f1b911..e00598d937 100644
--- a/packages/linux/handhelds-pxa-2.6_cvs.bb
+++ b/packages/linux/handhelds-pxa-2.6_cvs.bb
@@ -3,17 +3,17 @@ DESCRIPTION = "handhelds.org Linux kernel for PXA based devices."
 MAINTAINER = "Greg Gilbert <greg@treke.net>"
 LICENSE = "GPL"
 PV = "${K_MAJOR}.${K_MINOR}.${K_MICRO}-hh${HHV}+cvs${SRCDATE}"
-PR = "r1"
+PR = "r2"
 #
 COMPATIBLE_HOST = "arm.*-linux"
-COMPATIBLE_MACHINE = '(h3900|h5xxx|h2200|ipaq-pxa270)'
+COMPATIBLE_MACHINE = '(h3900|h5xxx|h2200|ipaq-pxa270|htcuniversal)'
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/handhelds-pxa-${PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26  \
            file://24-hostap_cs_id.diff;patch=1 \
            file://hrw-pcmcia-ids-r2.patch;patch=1 \
-           file://hx-iwmmxt.patch;patch=1 \
+           file://hx-iwmmxt.patch;patch=1;maxdate=20060807 \
 	   file://defconfig"
 
 S = "${WORKDIR}/kernel26"
@@ -22,6 +22,8 @@ inherit kernel
 
 FILES_kernel-image_ipaq-pxa270 = ""
 ALLOW_EMPTY_ipaq_pxa270 = 1
+FILES_kernel-image_htcuniversal = ""
+ALLOW_EMPTY_htcuniversal = 1
 
 K_MAJOR = "2"
 K_MINOR = "6"
diff --git a/packages/loudmouth/loudmouth_1.0.1.bb b/packages/loudmouth/loudmouth_1.0.1.bb
index 32cf9156fc..ab5ee81b9f 100644
--- a/packages/loudmouth/loudmouth_1.0.1.bb
+++ b/packages/loudmouth/loudmouth_1.0.1.bb
@@ -1,6 +1,6 @@
 LICENSE = "LGPL"
 DEPENDS = "glib-2.0 gnutls"
-MAINTAINER = "Koen Kooi <koen@handhelds.org>"
+MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 DESCRIPTION = "Loudmouth is a lightweight and easy-to-use C library for programming with the Jabber protocol."
 
 SRC_URI = "http://ftp.imendio.com/pub/imendio/${PN}/src/${PN}-${PV}.tar.gz"
diff --git a/packages/maemo/hildon-fm_0.9.1-2.bb b/packages/maemo/hildon-fm_0.9.1-2.bb
index 93bf0cbfa2..5be7259d98 100644
--- a/packages/maemo/hildon-fm_0.9.1-2.bb
+++ b/packages/maemo/hildon-fm_0.9.1-2.bb
@@ -1,6 +1,6 @@
 PR 	= 	"r1"
 LICENSE =	"GPL/LGPL"
-MAINTAINER = "Koen Kooi <koen@handhelds.org>"
+MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 
 DEPENDS =	"gtk+-2.6.4-1.osso7 outo libxi libxt libpng gconf hildon-lgpl osso-thumbnail osso-gwconnect"
 SRC_URI = 	"http://repository.maemo.org/pool/maemo/ossw/source/h/hildon-fm/hildon-fm_${PV}.tar.gz"
diff --git a/packages/maemo/hildon-lgpl_0.9.14-2.bb b/packages/maemo/hildon-lgpl_0.9.14-2.bb
index 9656fd85b6..7d09b02127 100644
--- a/packages/maemo/hildon-lgpl_0.9.14-2.bb
+++ b/packages/maemo/hildon-lgpl_0.9.14-2.bb
@@ -1,5 +1,5 @@
 LICENSE = 	"LGPL"
-MAINTAINER = "Koen Kooi <koen@handhelds.org>"
+MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 
 DEPENDS = "gtk+-2.6.4-1.osso7 outo libxtst libmatchbox libxi libxt libpng gconf"
 
diff --git a/packages/maemo/hildon-libs_0.9.6-2.bb b/packages/maemo/hildon-libs_0.9.6-2.bb
index 05403155b5..bcbdccb8e4 100644
--- a/packages/maemo/hildon-libs_0.9.6-2.bb
+++ b/packages/maemo/hildon-libs_0.9.6-2.bb
@@ -1,6 +1,6 @@
 PR 	= 	"r1"
 LICENSE = 	"LGPL"
-MAINTAINER = "Koen Kooi <koen@handhelds.org>"
+MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 
 DEPENDS =	"dbus hildon-lgpl hildon-fm outo gtk+-2.6.4-1.osso7"
 SRC_URI =	"http://repository.maemo.org/pool/maemo/ossw/source/h/${PN}/${PN}_${PV}.tar.gz \
diff --git a/packages/maemo/lessertunjo_0.0.10.bb b/packages/maemo/lessertunjo_0.0.10.bb
index bc76d6c295..a0c81af27b 100644
--- a/packages/maemo/lessertunjo_0.0.10.bb
+++ b/packages/maemo/lessertunjo_0.0.10.bb
@@ -1,5 +1,5 @@
 LICENSE =	"LGPL"
-MAINTAINER =	"Koen Kooi <koen@handhelds.org>"
+MAINTAINER =	"Koen Kooi <koen@linuxtogo.org>"
 
 DEPENDS =	"gconf-osso hildon-libs dbus libosso"
 SRC_URI =	"http://repository.maemo.org/pool/maemo/ossw/source/l/lessertunjo/lessertunjo_${PV}-3.tar.gz"
diff --git a/packages/maemo/libosso_0.8.9.bb b/packages/maemo/libosso_0.8.9.bb
index 288881ebd3..ead1b7ce37 100644
--- a/packages/maemo/libosso_0.8.9.bb
+++ b/packages/maemo/libosso_0.8.9.bb
@@ -1,5 +1,5 @@
 LICENSE = 	"LGPL"
-MAINTAINER =	"Koen Kooi <koen@handhelds.org>"
+MAINTAINER =	"Koen Kooi <koen@linuxtogo.org>"
 PR = "r2"
 
 DEPENDS = 	"glib-2.0 dbus outo"
diff --git a/packages/maemo/osso-af-utils_0.4.bb b/packages/maemo/osso-af-utils_0.4.bb
index 300e7804df..7ca7378c9c 100644
--- a/packages/maemo/osso-af-utils_0.4.bb
+++ b/packages/maemo/osso-af-utils_0.4.bb
@@ -1,5 +1,5 @@
 LICENSE =	"LGPL"
-MAINTAINER = "Koen Kooi <koen@handhelds.org>"
+MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 
 DEPENDS =	"virtual/libx11 dbus libosso"
 SRC_URI =	"http://stage.maemo.org:80/pool/maemo/ossw/source/o/osso-af-utils/osso-af-utils_${PV}-1.tar.gz"
diff --git a/packages/maemo/osso-bttools_0.25.1.bb b/packages/maemo/osso-bttools_0.25.1.bb
index f95b82aecd..9e602af548 100644
--- a/packages/maemo/osso-bttools_0.25.1.bb
+++ b/packages/maemo/osso-bttools_0.25.1.bb
@@ -1,5 +1,5 @@
 LICENSE =	"LGPL"
-MAINTAINER = "Koen Kooi <koen@handhelds.org>"
+MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 
 DEPENDS =	"dbus glib-2.0 libosso bluez-libs"
 
diff --git a/packages/maemo/osso-gwconnect_0.70.1.bb b/packages/maemo/osso-gwconnect_0.70.1.bb
index 47f5097301..bcf5caff7a 100644
--- a/packages/maemo/osso-gwconnect_0.70.1.bb
+++ b/packages/maemo/osso-gwconnect_0.70.1.bb
@@ -1,5 +1,5 @@
 LICENSE = 	""
-MAINTAINER = "Koen Kooi <koen@handhelds.org>"
+MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 
 DEPENDS =	"dbus gconf glib-2.0 libosso bluez-libs"
 
diff --git a/packages/maemo/osso-gwobex_0.26.1.bb b/packages/maemo/osso-gwobex_0.26.1.bb
index 3a7c1d8743..e6204cd212 100644
--- a/packages/maemo/osso-gwobex_0.26.1.bb
+++ b/packages/maemo/osso-gwobex_0.26.1.bb
@@ -1,5 +1,5 @@
 LICENSE =	"LGPL"
-MAINTAINER = "Koen Kooi <koen@handhelds.org>"
+MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 
 DEPENDS = 	"glib-2.0 openobex dbus libxml2 osso-gwconnect"
 
diff --git a/packages/maemo/osso-thumbnail_0.3.1-1.bb b/packages/maemo/osso-thumbnail_0.3.1-1.bb
index 03659654f3..551d4d4128 100644
--- a/packages/maemo/osso-thumbnail_0.3.1-1.bb
+++ b/packages/maemo/osso-thumbnail_0.3.1-1.bb
@@ -1,6 +1,6 @@
 PR 	= "r2"
 LICENSE =	""
-MAINTAINER = "Koen Kooi <koen@handhelds.org>"
+MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 
 DEPENDS = "gtk+-2.6.4-1.osso7 osso-gnome-vfs2"
 SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/o/osso-thumbnail/osso-thumbnail_${PV}.tar.gz"
diff --git a/packages/maemo/outo_0.1.1.bb b/packages/maemo/outo_0.1.1.bb
index 63f1ef4f9f..368b0bb243 100644
--- a/packages/maemo/outo_0.1.1.bb
+++ b/packages/maemo/outo_0.1.1.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Outo Unit Tester by Otso"
 LICENSE	=	"LGPL"
-MAINTAINER = "Koen Kooi <koen@handhelds.org>"
+MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 
 SRC_URI =	"http://repository.maemo.org/pool/maemo/ossw/source/o/outo/outo_${PV}.orig.tar.gz \
 			http://repository.maemo.org/pool/maemo/ossw/source/o/outo/outo_0.1.1-2.diff.gz;patch=1;pnum=1"
diff --git a/packages/matchbox-keyboard/matchbox-keyboard_svn.bb b/packages/matchbox-keyboard/matchbox-keyboard_svn.bb
index d2514d95c3..7042bf22d5 100644
--- a/packages/matchbox-keyboard/matchbox-keyboard_svn.bb
+++ b/packages/matchbox-keyboard/matchbox-keyboard_svn.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Matchbox virtual keyboard for X11"
 LICENSE = "GPL"
 DEPENDS = "libfakekey expat libxft"
 SECTION = "x11"
-MAINTAINER = "Koen Kooi <koen@handhelds.org>"
+MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 PV = "0.0+svn${SRCDATE}"
 PR="r2"
 
diff --git a/packages/meta/slugos-native.bb b/packages/meta/slugos-native.bb
index e40116d292..7af7f7961a 100644
--- a/packages/meta/slugos-native.bb
+++ b/packages/meta/slugos-native.bb
@@ -5,14 +5,13 @@
 #
 DESCRIPTION = "Packages that are required for the SlugOS native build environment"
 LICENSE = "MIT"
-PR = "r3"
+PR = "r4"
 
 INHIBIT_DEFAULT_DEPS = "1"
 EXCLUDE_FROM_WORLD = "1"
 ALLOW_EMPTY = "1"
 PACKAGES = "${PN}"
 PROVIDES += "${SLUGOS_IMAGENAME}-native"
-DEPENDS = "libc6-dev"
 
 # Run-time only (RDEPENDS) stuff - no package explicitly provides
 # these targets.
@@ -29,6 +28,7 @@ SLUGOS_NATIVE_RT = "\
 	gcc gcc-symlinks \
 	gdbm \
 	libstdc++-dev \
+	libc6-dev \
 	ncurses-dev ncurses-terminfo \
 	perl perl-modules \
 	python-core python-crypt python-io python-lang python-pickle python-shell python-textutils \
diff --git a/packages/nonworking/monotone-viz/monotone-viz_0.11.bb b/packages/nonworking/monotone-viz/monotone-viz_0.11.bb
index a0df63f445..6470fe7bb7 100644
--- a/packages/nonworking/monotone-viz/monotone-viz_0.11.bb
+++ b/packages/nonworking/monotone-viz/monotone-viz_0.11.bb
@@ -1,7 +1,7 @@
 DESCRIPTION =	"Monotone-viz is a small GTK+ application that visualizes monotone ancestry graphs."
 DEPENDS =	"gtk+ libgnomecanvas lablgtk sqlite3 ocaml-cross"
 RDEPENDS =	"graphviz"
-MAINTAINER =	"Koen Kooi <koen@handhelds.org>"
+MAINTAINER =	"Koen Kooi <koen@linuxtogo.org>"
 
 
 SRC_URI =	"http://oandrieu.nerim.net/monotone-viz/monotone-viz-0.11.tar.gz"
diff --git a/packages/opensync/libopensync-plugin-file_0.18.bb b/packages/opensync/libopensync-plugin-file_0.18.bb
index 332777e949..234413f114 100644
--- a/packages/opensync/libopensync-plugin-file_0.18.bb
+++ b/packages/opensync/libopensync-plugin-file_0.18.bb
@@ -5,7 +5,7 @@ LICENSE = "LGPL"
 DEPENDS = "libopensync"
 RRECOMMENDS = "multisync"
 HOMEPAGE = "http://www.opensync.org/"
-MAINTAINER = "Koen Kooi <koen@handhelds.org>"
+MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 
 inherit autotools pkgconfig
 
diff --git a/packages/opensync/libopensync-plugin-gpe_0.18.bb b/packages/opensync/libopensync-plugin-gpe_0.18.bb
index b8b27d3689..e1c59d328f 100644
--- a/packages/opensync/libopensync-plugin-gpe_0.18.bb
+++ b/packages/opensync/libopensync-plugin-gpe_0.18.bb
@@ -5,7 +5,7 @@ LICENSE = "LGPL"
 DEPENDS = "libopensync"
 RRECOMMENDS = "multisync"
 HOMEPAGE = "http://www.opensync.org/"
-MAINTAINER = "Koen Kooi <koen@handhelds.org>"
+MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 
 inherit autotools pkgconfig
 
diff --git a/packages/opensync/libopensync-plugin-irmc_0.18.bb b/packages/opensync/libopensync-plugin-irmc_0.18.bb
index 49cff5c25d..1e3b246a95 100644
--- a/packages/opensync/libopensync-plugin-irmc_0.18.bb
+++ b/packages/opensync/libopensync-plugin-irmc_0.18.bb
@@ -5,7 +5,7 @@ LICENSE = "LGPL"
 DEPENDS = "libopensync openobex bluez-libs"
 RRECOMMENDS = "multisync"
 HOMEPAGE = "http://www.opensync.org/"
-MAINTAINER = "Koen Kooi <koen@handhelds.org>"
+MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 
 inherit autotools pkgconfig
 
diff --git a/packages/opensync/libopensync_0.18.bb b/packages/opensync/libopensync_0.18.bb
index 1b3f338e51..eef443fc98 100644
--- a/packages/opensync/libopensync_0.18.bb
+++ b/packages/opensync/libopensync_0.18.bb
@@ -4,7 +4,7 @@ SRC_URI = "http://ewi546.ewi.utwente.nl/OE/source/libopensync-${PV}.tar.gz"
 LICENSE = "LGPL"
 DEPENDS = "sqlite3 libxml2 zlib glib-2.0"
 HOMEPAGE = "http://www.opensync.org/"
-MAINTAINER = "Koen Kooi <koen@handhelds.org>"
+MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 
 inherit autotools pkgconfig
 
diff --git a/packages/opensync/multisync_0.90.18.bb b/packages/opensync/multisync_0.90.18.bb
index 0d80412a58..d10c816c41 100644
--- a/packages/opensync/multisync_0.90.18.bb
+++ b/packages/opensync/multisync_0.90.18.bb
@@ -4,7 +4,7 @@ SRC_URI = "http://ewi546.ewi.utwente.nl/OE/source/${P}.tar.gz"
 LICENSE = "GPL"
 DEPENDS = "libopensync"
 HOMEPAGE = "http://www.opensync.org/"
-MAINTAINER = "Koen Kooi <koen@handhelds.org>"
+MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 
 inherit autotools pkgconfig
 
diff --git a/packages/opie-networksettings/opie-networksettings.inc b/packages/opie-networksettings/opie-networksettings.inc
index 9a9a88417d..c2f59fd04d 100644
--- a/packages/opie-networksettings/opie-networksettings.inc
+++ b/packages/opie-networksettings/opie-networksettings.inc
@@ -1,7 +1,7 @@
 DESCRIPTION = "Opie Network Settings"
 SECTION = "opie/settings"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 PROVIDES = "opie-networksettings-pppplugin opie-networksettings-wlanplugin"
 APPNAME = "networksettings"
diff --git a/packages/dbus/dbus-python/.mtn2git_empty b/packages/opie-sysinfo/opie-sysinfo/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/dbus/dbus-python/.mtn2git_empty
+++ b/packages/opie-sysinfo/opie-sysinfo/.mtn2git_empty
diff --git a/packages/opie-sysinfo/opie-sysinfo/jornada-6xx-7xx.patch b/packages/opie-sysinfo/opie-sysinfo/jornada-6xx-7xx.patch
new file mode 100644
index 0000000000..f214057e0c
--- /dev/null
+++ b/packages/opie-sysinfo/opie-sysinfo/jornada-6xx-7xx.patch
@@ -0,0 +1,13 @@
+--- sysinfo/versioninfo.cpp_orig	2006-08-06 15:16:55.000000000 +0000
++++ sysinfo/versioninfo.cpp	2006-08-06 15:17:31.000000000 +0000
+@@ -136,8 +136,8 @@
+         modelPixmap += "simpad";
+     else if ( model == Model_Jornada_56x )
+         modelPixmap += "jornada56x";
+-    else if ( model == Model_Jornada_720 )
+-        modelPixmap += "jornada720";
++    else if ( model == Model_Jornada_7xx )
++        modelPixmap += "jornada7xx";
+     else
+         modelPixmap += "pda";
+ 
diff --git a/packages/opie-sysinfo/opie-sysinfo_1.2.2.bb b/packages/opie-sysinfo/opie-sysinfo_1.2.2.bb
index 780559ab57..6517203c8e 100644
--- a/packages/opie-sysinfo/opie-sysinfo_1.2.2.bb
+++ b/packages/opie-sysinfo/opie-sysinfo_1.2.2.bb
@@ -5,4 +5,5 @@ require ${PN}.inc
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/sysinfo \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \
-           ${HANDHELDS_CVS};tag=${TAG};module=opie/share"
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/share \
+	   file://jornada-6xx-7xx.patch;patch=1"
diff --git a/packages/opie-taskbar/opie-taskbar.inc b/packages/opie-taskbar/opie-taskbar.inc
index 3f6c8bca2e..fd218d2a02 100644
--- a/packages/opie-taskbar/opie-taskbar.inc
+++ b/packages/opie-taskbar/opie-taskbar.inc
@@ -15,6 +15,7 @@ EXTRA_QMAKEVARS_POST_append_c7x0 	= "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE"
 EXTRA_QMAKEVARS_POST_append_tosa 	= "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE"
 EXTRA_QMAKEVARS_POST_append_spitz	= "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE"
 EXTRA_QMAKEVARS_POST_append_akita	= "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE"
+EXTRA_QMAKEVARS_POST_append_htcuniversal= "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE"
 
 # Wallpaper and welcome splash
 PIXMAP_SIZE 		= ""
@@ -23,6 +24,7 @@ PIXMAP_SIZE_spitz	= "-640x480"
 PIXMAP_SIZE_akita	= "-640x480"
 PIXMAP_SIZE_tosa 	= "-480x640"
 PIXMAP_SIZE_simpad 	= "-800x600"
+PIXMAP_SIZE_htcuniversal= "-480x640"
 
 inherit opie update-rc.d
 
diff --git a/packages/pango/pango_1.14.0.bb b/packages/pango/pango_1.14.0.bb
new file mode 100644
index 0000000000..77eee85214
--- /dev/null
+++ b/packages/pango/pango_1.14.0.bb
@@ -0,0 +1,49 @@
+LICENSE = "LGPL"
+SECTION = "x11/libs"
+# Xt needed to keep autoconf's check for X11 happy
+DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libx11 libxft xt gtk-doc cairo"
+DESCRIPTION = "The goal of the Pango project is to provide an \
+Open Source framework for the layout and rendering of \
+internationalized text."
+PR = "r0"
+
+RRECOMMENDS_${PN} = "pango-module-basic-x pango-module-basic-fc" 
+
+# seems to go wrong with default cflags
+FULL_OPTIMIZATION_arm = "-O2"
+
+SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/pango/1.14/pango-${PV}.tar.bz2 \
+	   file://no-tests.patch;patch=1 \
+		"
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--disable-glibtest \
+		--enable-explicit-deps=no \
+	        --disable-debug"
+
+FILES_${PN} = "/etc ${bindir} ${libdir}/libpango*.so.*"
+
+LIBV = "1.5.0"
+
+do_stage () {
+	for lib in pango pangox pangoft2 pangoxft pangocairo; do
+		oe_libinstall -so -C pango lib$lib-1.0 ${STAGING_LIBDIR}/
+	done
+	install -d ${STAGING_INCDIR}/pango
+	install -m 0644 ${S}/pango/pango*.h ${STAGING_INCDIR}/pango/
+}
+
+postinst_prologue() {
+if [ "x$D" != "x" ]; then
+  exit 1
+fi
+
+}
+
+python populate_packages_prepend () {
+	prologue = bb.data.getVar("postinst_prologue", d, 1)
+
+	modules_root = bb.data.expand('${libdir}/pango/${LIBV}/modules', d)
+
+	do_split_packages(d, modules_root, '^pango-(.*)\.so$', 'pango-module-%s', 'Pango module %s', prologue + 'pango-querymodules > /etc/pango/pango.modules')
+}
diff --git a/packages/poppler/poppler_0.5.3.bb b/packages/poppler/poppler_0.5.3.bb
new file mode 100644
index 0000000000..a974c66243
--- /dev/null
+++ b/packages/poppler/poppler_0.5.3.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "Poppler is a PDF rendering library based on the xpdf-3.0 code base."
+MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>"
+DEPENDS = "fontconfig jpeg gtk+ cairo"
+LICENSE = "GPL"
+PR = "r1"
+
+SRC_URI = "http://poppler.freedesktop.org/${PN}-${PV}.tar.gz"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--enable-xpdf-headers  --disable-gtk-test --disable-poppler-qt"  
+
+do_stage() {
+	autotools_stage_all
+}
diff --git a/packages/poppler/poppler_20060418.bb b/packages/poppler/poppler_20060418.bb
index b6daea0cd0..16ec699657 100644
--- a/packages/poppler/poppler_20060418.bb
+++ b/packages/poppler/poppler_20060418.bb
@@ -2,6 +2,7 @@ DESCRIPTION = "Poppler is a PDF rendering library based on the xpdf-3.0 code bas
 MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>"
 DEPENDS = "fontconfig jpeg gtk+ cairo"
 LICENSE = "GPL"
+PV = "0.5.1+cvs20060418"
 PR = "r0"
 
 SRC_URI = "cvs://anoncvs@cvs.freedesktop.org/cvs/poppler;module=poppler;date=${PV}"
diff --git a/packages/powernowd/powernowd_0.96.bb b/packages/powernowd/powernowd_0.96.bb
index f5a98aa4d2..0d953fe0b8 100644
--- a/packages/powernowd/powernowd_0.96.bb
+++ b/packages/powernowd/powernowd_0.96.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "A daemon to manage CPUfreq states"
 HOMEPAGE = "http://www.deater.net/john/powernowd.html"
 LICENSE = "GPLv2"
-MAINTAINER = "Koen Kooi <koen@handhelds.org>"
+MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 
 
 SRC_URI = "http://www.deater.net/john/${P}.tar.gz \
diff --git a/packages/puzzles/puzzles_r6712.bb b/packages/puzzles/puzzles_r6712.bb
index fe641570e2..41a6e808ab 100644
--- a/packages/puzzles/puzzles_r6712.bb
+++ b/packages/puzzles/puzzles_r6712.bb
@@ -7,7 +7,7 @@ SRC_URI = "svn://ixion.tartarus.org/main;module=puzzles;rev=6712 \
 S = "${WORKDIR}/puzzles/"
 
 do_configure() {
-        cd ${S} && ${STAGING_BINDIR}/perl mkfiles.pl
+        cd ${S} && perl mkfiles.pl
 }
 
 do_compile_prepend = " \
diff --git a/packages/python/python-pysqlite2_2.2.2.bb b/packages/python/python-pysqlite2_2.2.2.bb
index 72ffc39104..1f10a64226 100644
--- a/packages/python/python-pysqlite2_2.2.2.bb
+++ b/packages/python/python-pysqlite2_2.2.2.bb
@@ -3,10 +3,10 @@ SECTION = "devel/python"
 PRIORITY = "optional"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "PSF"
-RDEPENDS = "python-core python-re python-lang"
+RDEPENDS = "python-core python-re python-lang python-datetime"
 DEPENDS = "sqlite3"
 SRCNAME = "pysqlite"
-PR = "ml0"
+PR = "ml1"
 
 SRC_URI = "http://initd.org/pub/software/pysqlite/releases/2.2/${PV}/${SRCNAME}-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
diff --git a/packages/roadster/roadster_cvs.bb b/packages/roadster/roadster_cvs.bb
index 8f2a2b71a4..0b7b845380 100644
--- a/packages/roadster/roadster_cvs.bb
+++ b/packages/roadster/roadster_cvs.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Roadster aims to be easy-to-use and open-source mapping software."
 LICENSE = "GPL"
 HOMEPAGE = "http://linuxadvocate.org/projects/roadster/"
-MAINTAINER = "Koen Kooi <koen@handhelds.org>"
+MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 PV = "0.0+cvs${SRCDATE}"
 
 DEPENDS = "tcp-wrappers mysql gpsd gtk+ cairo libxml2 libgnomeui libglade"
diff --git a/packages/xfonts/.mtn2git_empty b/packages/scratchbox/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/xfonts/.mtn2git_empty
+++ b/packages/scratchbox/.mtn2git_empty
diff --git a/packages/scratchbox/sbrsh_7.1.bb b/packages/scratchbox/sbrsh_7.1.bb
new file mode 100644
index 0000000000..e692d2f242
--- /dev/null
+++ b/packages/scratchbox/sbrsh_7.1.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "Daemon to allow scratchbox to use your device as a CPU tranparency target"
+HOMEPAGE = "http://scratchbox.org"
+LICENSE = "GPLv2"
+DEPENDS = "fakeroot"
+PR = "r1"
+RRECOMMENDS = "kernel-module-nfs"
+
+
+SRC_URI = "http://scratchbox.org/download/files/sbox-releases/apophis/src/${P}.tar.gz" 
+
+do_install() {
+	install -d ${D}${sbindir}
+	install -m 755 sbrsh sbrshd sb-exportfs ${D}${sbindir}
+	install -d ${D}/${sysconfdir}
+	touch ${D}/${sysconfdir}/sbrshd.conf
+}
+
+CONFFILES_${PN} = "${sysconfdir}/sbrshd.conf"
diff --git a/packages/speex/speex_1.1.12.bb b/packages/speex/speex_1.1.12.bb
index bd19dcf717..c34d459a26 100644
--- a/packages/speex/speex_1.1.12.bb
+++ b/packages/speex/speex_1.1.12.bb
@@ -7,6 +7,8 @@ PR = "r1"
 
 SRC_URI = "http://downloads.us.xiph.org/releases/speex/speex-${PV}.tar.gz"
 
+PARALLEL_MAKE = ""
+
 inherit autotools pkgconfig
 
 # Some interesting options are:
diff --git a/packages/sylpheed/sylpheed-claws-plugin-mailmbox_1.12.1.bb b/packages/sylpheed/sylpheed-claws-plugin-mailmbox_1.12.1.bb
new file mode 100644
index 0000000000..39ed9152aa
--- /dev/null
+++ b/packages/sylpheed/sylpheed-claws-plugin-mailmbox_1.12.1.bb
@@ -0,0 +1,5 @@
+require sylpheed-claws-extra-plugins.inc
+
+SRC_URI = "http://www.sylpheed-claws.net/downloads/plugins/mailmbox-1.12.1.tar.gz"
+S = "${WORKDIR}/mailmbox-1.12.1" 
+
diff --git a/packages/sysvinit/sysvinit/htcuniversal/inittab b/packages/sysvinit/sysvinit/htcuniversal/inittab
index 8714c7ee93..6abbdf4558 100644
--- a/packages/sysvinit/sysvinit/htcuniversal/inittab
+++ b/packages/sysvinit/sysvinit/htcuniversal/inittab
@@ -28,7 +28,3 @@ l5:5:wait:/etc/init.d/rc 5
 l6:6:wait:/etc/init.d/rc 6
 # Normally not reached, but fallthrough in case of emergency.
 z6:6:respawn:/sbin/sulogin
-1:2345:respawn:/sbin/getty 115200 tty1
-2:2345:respawn:/sbin/getty 115200 tty2
-3:2345:respawn:/sbin/getty 115200 tty3
-4:2345:respawn:/sbin/getty 115200 tty4
diff --git a/packages/sysvinit/sysvinit_2.86.bb b/packages/sysvinit/sysvinit_2.86.bb
index a9644e45a4..aa3e88f189 100644
--- a/packages/sysvinit/sysvinit_2.86.bb
+++ b/packages/sysvinit/sysvinit_2.86.bb
@@ -3,7 +3,7 @@ SECTION = "base"
 LICENSE = "GPL"
 MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 HOMEPAGE = "http://freshmeat.net/projects/sysvinit/"
-PR = "r25"
+PR = "r26"
 
 # USE_VT and SERIAL_CONSOLE are generally defined by the MACHINE .conf.
 # Set PACKAGE_ARCH appropriately.
diff --git a/packages/telepathy/telepathy-gabble_20060503.bb b/packages/telepathy/telepathy-gabble_0.3.0.bb
index c873894f1c..78440a7148 100644
--- a/packages/telepathy/telepathy-gabble_20060503.bb
+++ b/packages/telepathy/telepathy-gabble_0.3.0.bb
@@ -4,11 +4,10 @@ DEPENDS = "glib-2.0 dbus loudmouth"
 LICENSE = "lgpl"
 MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>"
 
-SRC_URI = "http://ewi546.ewi.utwente.nl/OE/source/telepathy-gabble-${PV}.tar.bz2"
+SRC_URI = "http://telepathy.freedesktop.org/releases/telepathy-gabble/${P}.tar.gz"
 
 inherit autotools pkgconfig
 
-S = "${WORKDIR}/${PN}/"
 
 FILES_${PN} += "${datadir}/telepathy \
 		${datadir}/dbus-1"
diff --git a/packages/teleport/teleport_0.33.bb b/packages/teleport/teleport_0.33.bb
index a8730433f0..d25398220b 100644
--- a/packages/teleport/teleport_0.33.bb
+++ b/packages/teleport/teleport_0.33.bb
@@ -3,7 +3,7 @@ LICENSE = "GPL"
 
 DESCRIPTION = "Teleport app"
 DEPENDS = "gtk+ libgpewidget libdisplaymigration libgcrypt sqlite"
-MAINTAINER = "Koen Kooi  <koen@handhelds.org>"
+MAINTAINER = "Koen Kooi  <koen@linuxtogo.org>"
 SECTION = "gpe"
 PRIORITY = "optional"
 PR = "r2"
diff --git a/packages/teleport/teleport_0.34.bb b/packages/teleport/teleport_0.34.bb
index 3b89a5be51..f97432d8a5 100644
--- a/packages/teleport/teleport_0.34.bb
+++ b/packages/teleport/teleport_0.34.bb
@@ -2,5 +2,5 @@ inherit gpe
 LICENSE = "GPL"
 DESCRIPTION = "Teleport app"
 DEPENDS = "gtk+ libgpewidget libdisplaymigration libgcrypt sqlite"
-MAINTAINER = "Koen Kooi  <koen@handhelds.org>"SECTION = "gpe"
+MAINTAINER = "Koen Kooi  <koen@linuxtogo.org>"SECTION = "gpe"
 PRIORITY = "optional"
diff --git a/packages/tilibs/libticables_3.9.2.bb b/packages/tilibs/libticables_3.9.2.bb
index ba8497ec60..4f59a7fa7d 100644
--- a/packages/tilibs/libticables_3.9.2.bb
+++ b/packages/tilibs/libticables_3.9.2.bb
@@ -1,5 +1,5 @@
 LICENSE = "GPLv2"
-MAINTAINER = "Koen Kooi <koen@handhelds.org>"
+MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 HOMEPAGE = "http://lpg.ticalc.org/prj_tilp/index.html"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/tilp/${P}.tar.gz"
diff --git a/packages/tilibs/libticalcs_4.5.9.bb b/packages/tilibs/libticalcs_4.5.9.bb
index f106d0f364..efe83ba746 100644
--- a/packages/tilibs/libticalcs_4.5.9.bb
+++ b/packages/tilibs/libticalcs_4.5.9.bb
@@ -1,5 +1,5 @@
 LICENSE = "GPLv2"
-MAINTAINER = "Koen Kooi <koen@handhelds.org>"
+MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 HOMEPAGE = "http://lpg.ticalc.org/prj_tilp/index.html"
 
 DPENDS = "libticables libtifiles"
diff --git a/packages/tilibs/libtifiles_0.6.5.bb b/packages/tilibs/libtifiles_0.6.5.bb
index aa44094a61..62277d9656 100644
--- a/packages/tilibs/libtifiles_0.6.5.bb
+++ b/packages/tilibs/libtifiles_0.6.5.bb
@@ -1,5 +1,5 @@
 LICENSE = "GPLv2"
-MAINTAINER = "Koen Kooi <koen@handhelds.org>"
+MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 HOMEPAGE = "http://lpg.ticalc.org/prj_tilp/index.html"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/tilp/${P}.tar.gz"
diff --git a/packages/tsclient/tsclient_0.140.bb b/packages/tsclient/tsclient_0.140.bb
index 368c66a230..2d744687ac 100644
--- a/packages/tsclient/tsclient_0.140.bb
+++ b/packages/tsclient/tsclient_0.140.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "tsclient == a frontend for rdesktop and other remote desktop tool"
 HOMEPAGE = "http://www.gnomepro.com/tsclient/"
-MAINTAINER = "Koen Kooi <koen@handhelds.org>"
+MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 LICENSE = "GPL"
 DEPENDS = "glib-2.0 gtk+ libpanelapplet rdesktop"
 RDEPENDS = "rdesktop"
diff --git a/packages/vte/vte_0.11.15.bb b/packages/vte/vte_0.11.15.bb
index 5565f8c9c0..d195c094eb 100644
--- a/packages/vte/vte_0.11.15.bb
+++ b/packages/vte/vte_0.11.15.bb
@@ -1,5 +1,5 @@
 LICENSE = "LGPL"
-MAINTAINER = "Koen Kooi <koen@handhelds.org>"
+MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 
 inherit gnome
 
diff --git a/packages/xchat/xchat_2.6.0.bb b/packages/xchat/xchat_2.6.0.bb
index 462ed4d6e9..4f8d990a87 100644
--- a/packages/xchat/xchat_2.6.0.bb
+++ b/packages/xchat/xchat_2.6.0.bb
@@ -1,6 +1,6 @@
 LICENSE = "GPL"
 HOMEPAGE = "http://www.xchat.org"
-MAINTAINER = "Koen Kooi <koen@handhelds.org"
+MAINTAINER = "Koen Kooi <koen@linuxtogo.org"
 DEPENDS = "libgcrypt zlib gtk+"
 SRC_URI = "http://www.xchat.org/files/source/2.6/xchat-${PV}.tar.bz2"
 
diff --git a/packages/xchat/xchat_2.6.1.bb b/packages/xchat/xchat_2.6.1.bb
index 462ed4d6e9..4f8d990a87 100644
--- a/packages/xchat/xchat_2.6.1.bb
+++ b/packages/xchat/xchat_2.6.1.bb
@@ -1,6 +1,6 @@
 LICENSE = "GPL"
 HOMEPAGE = "http://www.xchat.org"
-MAINTAINER = "Koen Kooi <koen@handhelds.org"
+MAINTAINER = "Koen Kooi <koen@linuxtogo.org"
 DEPENDS = "libgcrypt zlib gtk+"
 SRC_URI = "http://www.xchat.org/files/source/2.6/xchat-${PV}.tar.bz2"
 
diff --git a/packages/xhost/.mtn2git_empty b/packages/xhost/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/xhost/.mtn2git_empty
+++ /dev/null
diff --git a/packages/xlibs/.mtn2git_empty b/packages/xlibs/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/xlibs/.mtn2git_empty
+++ /dev/null
diff --git a/packages/xmodmap/.mtn2git_empty b/packages/xmodmap/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/xmodmap/.mtn2git_empty
+++ /dev/null
diff --git a/packages/xorg-app/xorg-app-common.inc b/packages/xorg-app/xorg-app-common.inc
index 78146b1e78..53aa991b9f 100644
--- a/packages/xorg-app/xorg-app-common.inc
+++ b/packages/xorg-app/xorg-app-common.inc
@@ -6,7 +6,7 @@ LICENSE = "MIT-X"
 
 #DEPENDS = ""
 XORG_PN = "${PN}"
-SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/app/${XORG_PN}-${PV}.tar.gz"
+SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/app/${XORG_PN}-${PV}.tar.bz2"
 S = "${WORKDIR}/${XORG_PN}-${PV}"
 
 FILES_${PN} += "  /usr/lib/X11/${XORG_PN}"
diff --git a/packages/xorg-data/xorg-data-common.inc b/packages/xorg-data/xorg-data-common.inc
index ade9fdec58..095bc095fc 100644
--- a/packages/xorg-data/xorg-data-common.inc
+++ b/packages/xorg-data/xorg-data-common.inc
@@ -6,7 +6,7 @@ LICENSE = "MIT-X"
 
 #DEPENDS = ""
 XORG_PN = "${PN}"
-SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/data/${XORG_PN}-${PV}.tar.gz"
+SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/data/${XORG_PN}-${PV}.tar.bz2"
 S = "${WORKDIR}/${XORG_PN}-${PV}"
 
 inherit autotools pkgconfig
diff --git a/packages/xorg-doc/xorg-doc-common.inc b/packages/xorg-doc/xorg-doc-common.inc
index 91a297265b..3be252d076 100644
--- a/packages/xorg-doc/xorg-doc-common.inc
+++ b/packages/xorg-doc/xorg-doc-common.inc
@@ -6,7 +6,7 @@ LICENSE = "MIT-X"
 
 #DEPENDS = ""
 XORG_PN = "${PN}"
-SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/doc/${XORG_PN}-${PV}.tar.gz"
+SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/doc/${XORG_PN}-${PV}.tar.bz2"
 S = "${WORKDIR}/${XORG_PN}-${PV}"
 
 inherit autotools pkgconfig
diff --git a/packages/xorg-driver/xorg-driver-common.inc b/packages/xorg-driver/xorg-driver-common.inc
index 361914db24..6d8204b9b1 100644
--- a/packages/xorg-driver/xorg-driver-common.inc
+++ b/packages/xorg-driver/xorg-driver-common.inc
@@ -7,7 +7,7 @@ LICENSE = "MIT-X"
 DEPENDS = "randrproto xorg-server xproto"
 
 XORG_PN = "${PN}"
-SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/driver/${XORG_PN}-${PV}.tar.gz"
+SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/driver/${XORG_PN}-${PV}.tar.bz2"
 
 S = "${WORKDIR}/${XORG_PN}-${PV}"
 
diff --git a/packages/xorg-font/xorg-font-common.inc b/packages/xorg-font/xorg-font-common.inc
index 38fd1af5a5..8a6bd0b475 100644
--- a/packages/xorg-font/xorg-font-common.inc
+++ b/packages/xorg-font/xorg-font-common.inc
@@ -7,7 +7,7 @@ DEPENDS = " encodings font-alias font-util-native mkfontdir-native mkfontscale-n
 RDEPENDS = "encodings font-util font-alias"
 
 XORG_PN = "${PN}"
-SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/font/${XORG_PN}-${PV}.tar.gz"
+SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/font/${XORG_PN}-${PV}.tar.bz2"
 S = "${WORKDIR}/${XORG_PN}-${PV}"
 
 inherit autotools pkgconfig
diff --git a/packages/xorg-fonts/.mtn2git_empty b/packages/xorg-fonts/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/xorg-fonts/.mtn2git_empty
+++ /dev/null
diff --git a/packages/xorg-lib/diet-x11_X11R7.1-1.0.1.bb b/packages/xorg-lib/diet-x11_X11R7.1-1.0.1.bb
index 33e50df13a..688d59eef6 100644
--- a/packages/xorg-lib/diet-x11_X11R7.1-1.0.1.bb
+++ b/packages/xorg-lib/diet-x11_X11R7.1-1.0.1.bb
@@ -4,6 +4,9 @@ require libx11_${PV}.bb
 EXTRA_OECONF += "--disable-udc --disable-xcms --disable-xlocale --disable-xkb"
 CFLAGS += "-D_GNU_SOURCE"
 
+PR = "r1"
+
 SRC_URI += "file://X18NCMSstubs.diff;patch=1 \
 	    file://fix-disable-xlocale.diff;patch=1 \
-            file://fix-utf8-wrong-define.patch;patch=1"
+            file://fix-utf8-wrong-define.patch;patch=1 \
+	    file://xim.patch;patch=1"
diff --git a/packages/xorg-lib/xorg-lib-common.inc b/packages/xorg-lib/xorg-lib-common.inc
index 7a3e0425c7..8e5ba5874f 100644
--- a/packages/xorg-lib/xorg-lib-common.inc
+++ b/packages/xorg-lib/xorg-lib-common.inc
@@ -5,7 +5,7 @@ LICENSE = "MIT-X"
 
 DEPENDS = "util-macros"
 XORG_PN = "${PN}"
-SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/lib/${XORG_PN}-${PV}.tar.gz"
+SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/lib/${XORG_PN}-${PV}.tar.bz2"
 S = "${WORKDIR}/${XORG_PN}-${PV}"
 
 inherit autotools pkgconfig
diff --git a/packages/xorg-proto/xorg-proto-common.inc b/packages/xorg-proto/xorg-proto-common.inc
index 74e7312a50..4d189235f4 100644
--- a/packages/xorg-proto/xorg-proto-common.inc
+++ b/packages/xorg-proto/xorg-proto-common.inc
@@ -6,7 +6,7 @@ LICENSE = "MIT-X"
 
 #DEPENDS = ""
 XORG_PN = "${PN}"
-SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/proto/${XORG_PN}-${PV}.tar.gz"
+SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/proto/${XORG_PN}-${PV}.tar.bz2"
 S = "${WORKDIR}/${XORG_PN}-${PV}"
 
 inherit autotools pkgconfig
diff --git a/packages/xorg-xserver/xorg-xserver-common.inc b/packages/xorg-xserver/xorg-xserver-common.inc
index 6c1bbd34a9..5f5f5c0dea 100644
--- a/packages/xorg-xserver/xorg-xserver-common.inc
+++ b/packages/xorg-xserver/xorg-xserver-common.inc
@@ -18,7 +18,7 @@ libxkbui libxxf86misc libxi libdmx libxtst libxres mesa"
 REPENDS="rgb"
 
 XORG_PN = "xorg-server"
-SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/xserver/${XORG_PN}-${PV}.tar.gz \
+SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/xserver/${XORG_PN}-${PV}.tar.bz2 \
 	file://xorg.conf"
 
 S = "${WORKDIR}/${XORG_PN}-${PV}"
diff --git a/packages/xorg-xserver/xserver-kdrive_git.bb b/packages/xorg-xserver/xserver-kdrive_git.bb
index 491e486b3d..90fa12aebb 100644
--- a/packages/xorg-xserver/xserver-kdrive_git.bb
+++ b/packages/xorg-xserver/xserver-kdrive_git.bb
@@ -2,7 +2,7 @@ PV = "1.1.0+git${SRCDATE}"
 DEFAULT_PREFERENCE = "-2"
 
 LICENSE = "MIT"
-DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau virtual/libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto videoproto scrnsaverproto"
+DEPENDS = "tslib libxkbfile xf86dgaproto xf86vidmodeproto xf86miscproto xproto libxdmcp xextproto xtrans libxau virtual/libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto videoproto scrnsaverproto"
 
 PROVIDES = "virtual/xserver"
 RPROVIDES = "virtual/xserver"
diff --git a/packages/xprop/.mtn2git_empty b/packages/xprop/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/xprop/.mtn2git_empty
+++ /dev/null
diff --git a/packages/xproto/.mtn2git_empty b/packages/xproto/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/xproto/.mtn2git_empty
+++ /dev/null
diff --git a/packages/xrandr/.mtn2git_empty b/packages/xrandr/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/xrandr/.mtn2git_empty
+++ /dev/null
diff --git a/packages/xrdb/.mtn2git_empty b/packages/xrdb/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/xrdb/.mtn2git_empty
+++ /dev/null
diff --git a/packages/xserver-common/.mtn2git_empty b/packages/xserver-common/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/xserver-common/.mtn2git_empty
+++ /dev/null
diff --git a/packages/xset/.mtn2git_empty b/packages/xset/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/xset/.mtn2git_empty
+++ /dev/null
author	Philip Balister <philip@balister.org>	2006-08-10 22:43:16 +0000
committer	Philip Balister <philip@balister.org>	2006-08-10 22:43:16 +0000
commit	4f73c4261ac303c8e0c7cf7fed753a960ae18cc8 (patch)
tree	bbc896465464998401c3decd2f46c940753d3d7f /packages
parent	b0d728d444fca302a14672f02aaf7b9375690b6b (diff)
parent	3d2bc34ebd06e8bfa612f4ef2e8edc4c758a99c7 (diff)