From 97c50314e4bdde8dd4cc9f81f92b64c3ccb63c73 Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Mon, 10 Dec 2007 14:45:07 +0000
Subject: expedite cvs fix version number, add rdependencies on necessary evas
 low level modules

---
 packages/e17/expedite_cvs.bb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/e17/expedite_cvs.bb b/packages/e17/expedite_cvs.bb
index a35d3b182e..7eae0ea9a4 100644
--- a/packages/e17/expedite_cvs.bb
+++ b/packages/e17/expedite_cvs.bb
@@ -1,8 +1,9 @@
 DESCRIPTION = "Expedite is a comprehensive benchmarking suite for Evas"
 DEPENDS = "eet evas"
+RDEPENDS = "libevas-engine-buffer libevas-engine-fb libevas-engine-software-generic libevas-engine-software-x11 libevas-loader-png"
 LICENSE = "MIT"
-PV = "0.0.0+cvs${SRCDATE}"
-PR = "r1"
+PV = "0.6.0+cvs${SRCDATE}"
+PR = "r0"
 
 inherit autotools
 
-- 
cgit v1.2.3


From c8426ed007a275b1e77c9db80fdac06cb005e0ae Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Mon, 10 Dec 2007 14:45:30 +0000
Subject: evas cvs use PACKAGE_DYNAMIC to announce individual low level modules

---
 packages/efl1/evas.inc    | 2 ++
 packages/efl1/evas_cvs.bb | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/efl1/evas.inc b/packages/efl1/evas.inc
index de3359114c..179f03b0d8 100644
--- a/packages/efl1/evas.inc
+++ b/packages/efl1/evas.inc
@@ -33,3 +33,5 @@ do_install_append() {
 FILES_${PN}-dev += "${libdir}/evas/modules/*/*/*/*.a ${libdir}/evas/modules/*/*/*/*.la"
 FILES_${PN}-dbg += "${libdir}/evas/modules/*/*/*/.debug/"
 FILES_${PN} = "${libdir}/libevas*.so*"
+
+PACKAGES_DYNAMIC = "libevas-engine-* libevas-loader-* libevas-saver-*"
diff --git a/packages/efl1/evas_cvs.bb b/packages/efl1/evas_cvs.bb
index a19a9c944b..1bacbe3d1c 100644
--- a/packages/efl1/evas_cvs.bb
+++ b/packages/efl1/evas_cvs.bb
@@ -1,5 +1,5 @@
 require evas.inc
-PR = "r2"
+PR = "r3"
 
 EXTRA_OECONF = "\
 		--x-includes=${STAGING_INCDIR}/X11  \
-- 
cgit v1.2.3


From 7dd2b725aefc48f89c4acc3ec268460cefc0661f Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Mon, 10 Dec 2007 19:50:57 +0000
Subject: directfb 1.1.0 fix pkgconfig issue at last, clean up recipe, fix
 packaging

---
 packages/directfb/directfb_1.0.0.bb                | 56 ------------------
 packages/directfb/directfb_1.1.0.bb                | 66 ++++++++++++----------
 packages/directfb/files/fix-pkgconfig-cflags.patch | 10 ++--
 3 files changed, 42 insertions(+), 90 deletions(-)
 delete mode 100644 packages/directfb/directfb_1.0.0.bb

diff --git a/packages/directfb/directfb_1.0.0.bb b/packages/directfb/directfb_1.0.0.bb
deleted file mode 100644
index c2d249e978..0000000000
--- a/packages/directfb/directfb_1.0.0.bb
+++ /dev/null
@@ -1,56 +0,0 @@
-DESCRIPTION = "DirectFB is a thin library that provides developers \
-with hardware graphics acceleration, input device handling and \
-abstraction, an integrated windowing system with support for \
-translucent windows and multiple display layers on top of the \
-Linux framebuffer device."
-SECTION = "libs"
-LICENSE = "LGPL"
-HOMEPAGE = "http://directfb.org"
-DEPENDS = "jpeg libpng freetype zlib tslib"
-PR = "r5"
-RV = "1.0-0"
-
-SRC_URI = "http://www.directfb.org/download/DirectFB/DirectFB-${PV}.tar.gz \
-           file://fix-pkgconfig-specs.patch;patch=1 \
-           file://mkdfiff.patch;patch=1 \
-           file://getpagesize.patch;patch=1 \
-           file://fix-includes.patch;patch=1"
-S = "${WORKDIR}/DirectFB-1.0.0"
-
-LDFLAGS_append =" -lts -lm"
-
-inherit autotools pkgconfig
-
-EXTRA_OECONF = "\
-		--with-gfxdrivers=none \
-		--enable-libmpeg3=no \
-		--enable-freetype=yes \
-		--enable-sdl=no \
-        --enable-vnc=no \
-		"
-
-do_stage() {
-        autotools_stage_all
-}
-
-do_install() {
-        oe_runmake 'DESTDIR=${D}' install
-}
-
-
-FILES_directfb-dbg_append = " ${libdir}/directfb-${RV}/*/*/.debug/*.so \
-                            ${libdir}/directfb-${RV}/*/.debug/*.so \
-"
-
-FILES_directfb-dev_append = " ${libdir}/directfb-${RV}/systems/*.la \
-                              ${libdir}/directfb-${RV}/inputdrivers/*.la \
-                              ${libdir}/directfb-${RV}/interfaces/*/*.la \
-                              ${libdir}/directfb-${RV}/wm/*.la \
-"
-
-FILES_directfb_append = " ${libdir}/directfb-${RV}/systems/*.so \
-                          ${libdir}/directfb-${RV}/inputdrivers/*.so \
-                          ${libdir}/directfb-${RV}/interfaces/*/*.so \
-                          ${libdir}/directfb-${RV}/wm/*.so \
-                          ${datadir}/directfb-1.0.0 \
-"
diff --git a/packages/directfb/directfb_1.1.0.bb b/packages/directfb/directfb_1.1.0.bb
index c3c1e66413..8fe4fd418a 100644
--- a/packages/directfb/directfb_1.1.0.bb
+++ b/packages/directfb/directfb_1.1.0.bb
@@ -7,8 +7,8 @@ SECTION = "libs"
 LICENSE = "LGPL"
 HOMEPAGE = "http://directfb.org"
 DEPENDS = "jpeg libpng freetype zlib tslib"
-PR = "r2"
 RV = "1.1-0"
+PR = "r3"
 
 SRC_URI = " \
     http://www.directfb.org/download/DirectFB/DirectFB-${PV}.tar.gz \
@@ -17,22 +17,21 @@ SRC_URI = " \
     file://getpagesize.patch;patch=1 \
     file://fix-includes.patch;patch=1 \
     file://mkdfiff.patch;patch=1 \
-   "
-
+"
 S = "${WORKDIR}/DirectFB-${PV}"
 
 LDFLAGS_append =" -lts -lm"
 
 inherit autotools pkgconfig
 
-EXTRA_OECONF = " \
-    --with-gfxdrivers=none \
-		--enable-libmpeg3=no \
-		--enable-freetype=yes \
-		--enable-sdl=no \
-		--enable-vnc=no \
-		--disable-x11 \
-		"
+EXTRA_OECONF = "\
+  --with-gfxdrivers=none \
+  --enable-libmpeg3=no \
+  --enable-freetype=yes \
+  --enable-sdl=no \
+  --enable-vnc=no \
+  --disable-x11 \
+"
 
 do_stage() {
         autotools_stage_all
@@ -42,27 +41,36 @@ do_install() {
         oe_runmake 'DESTDIR=${D}' install
 }
 
-PACKAGES_DYNAMIC = "directfb-inputdrivers-*"
 
+#PACKAGES_DYNAMIC = "directfb-inputdrivers-*"
+#
 #python populate_packages_prepend () {
-#	import os.path
-#	inputdrivers_libdir    = bb.data.expand('${libdir}/directfb-${RV}/inputdrivers', d)
-#        do_split_packages(d, inputdrivers_libdir, '*.so$', 'directfb-inputdrivers-%s', 'Directfb plugin for %s')
+#    import os.path
+#    inputdrivers_libdir = bb.data.expand('${libdir}/directfb-${RV}/inputdrivers', d)
+#    do_split_packages(d, inputdrivers_libdir, '*.so$', 'directfb-inputdrivers-%s', 'Directfb plugin for %s')
 #}
-FILES_directfb-dbg_append = " ${libdir}/directfb-${RV}/*/*/.debug/*.so \
-			      ${libdir}/directfb-${RV}/*/.debug/*.so \
-			  "
 
-FILES_directfb-dev_append = " ${libdir}/directfb-${RV}/systems/*.la \
-                              ${libdir}/directfb-${RV}/inputdrivers/*.la \
-                              ${libdir}/directfb-${RV}/interfaces/*/*.la \
-                              ${libdir}/directfb-${RV}/wm/*.la \
-			"
+# NOTE: monolithic packaging for now, should improve that eventually
+
+
+
+FILES_${PN}-dbg += "\
+  ${libdir}/directfb-${RV}/*/*/.debug/*.so \
+  ${libdir}/directfb-${RV}/*/.debug/*.so \
+"
 
+FILES_${PN}-dev += "\
+  ${bindir}/directfb-config \
+  ${libdir}/directfb-${RV}/systems/*.la \
+  ${libdir}/directfb-${RV}/inputdrivers/*.la \
+  ${libdir}/directfb-${RV}/interfaces/*/*.la \
+  ${libdir}/directfb-${RV}/wm/*.la \
+"
 
-FILES_directfb_append = " ${libdir}/directfb-${RV}/systems/*.so \
-        #                  ${libdir}/directfb-${RV}/inputdrivers/*.so \
-        #                  ${libdir}/directfb-${RV}/interfaces/*/*.so \
-                          ${libdir}/directfb-${RV}/wm/*.so \
-                          ${datadir}/directfb-1.1.0 \
-			  "
+FILES_${PN} += "\
+  ${libdir}/directfb-${RV}/systems/*.so \
+  ${libdir}/directfb-${RV}/inputdrivers/*.so \
+  ${libdir}/directfb-${RV}/interfaces/*/*.so \
+  ${libdir}/directfb-${RV}/wm/*.so \
+  ${datadir}/directfb-${PV} \
+"
diff --git a/packages/directfb/files/fix-pkgconfig-cflags.patch b/packages/directfb/files/fix-pkgconfig-cflags.patch
index 0273b58ec5..ddaa276fcd 100644
--- a/packages/directfb/files/fix-pkgconfig-cflags.patch
+++ b/packages/directfb/files/fix-pkgconfig-cflags.patch
@@ -6,7 +6,7 @@ diff -ur DirectFB-1.0.0~org/directfb-internal.pc.in DirectFB-1.0.0/directfb-inte
  Version: @VERSION@
  Requires: directfb = @VERSION@
 -Cflags: @DFB_INTERNAL_CFLAGS@ -I@INTERNALINCLUDEDIR@
-+Cflags: @DFB_INTERNAL_CFLAGS@ -I${includedir}
++Cflags: @DFB_INTERNAL_CFLAGS@ -I${includedir}/directfb -I${includedir}
 diff -ur DirectFB-1.0.0~org/directfb.pc.in DirectFB-1.0.0/directfb.pc.in
 --- DirectFB-1.0.0~org/directfb.pc.in	2004-08-04 12:28:20.000000000 -0400
 +++ DirectFB-1.0.0/directfb.pc.in	2007-03-16 22:31:33.000000000 -0400
@@ -15,7 +15,7 @@ diff -ur DirectFB-1.0.0~org/directfb.pc.in DirectFB-1.0.0/directfb.pc.in
  Requires: fusion direct
  Libs: -L${libdir} -ldirectfb @THREADLIB@ @DYNLIB@ @ZLIB_LIBS@ @OSX_LIBS@
 -Cflags: @THREADFLAGS@ -I@INCLUDEDIR@
-+Cflags: @THREADFLAGS@ -I${includedir}
++Cflags: @THREADFLAGS@ -I${includedir}/directfb -I${includedir}
 diff -ur DirectFB-1.0.0~org/lib/direct/direct.pc.in DirectFB-1.0.0/lib/direct/direct.pc.in
 --- DirectFB-1.0.0~org/lib/direct/direct.pc.in	2005-11-23 09:18:59.000000000 -0500
 +++ DirectFB-1.0.0/lib/direct/direct.pc.in	2007-03-16 22:32:13.000000000 -0400
@@ -24,7 +24,7 @@ diff -ur DirectFB-1.0.0~org/lib/direct/direct.pc.in DirectFB-1.0.0/lib/direct/di
  Version: @VERSION@
  Libs: -L${libdir} -ldirect @THREADLIB@ @DYNLIB@
 -Cflags: @THREADFLAGS@ -I@INCLUDEDIR@
-+Cflags: @THREADFLAGS@ -I${includedir}
++Cflags: @THREADFLAGS@ -I${includedir}/directfb -I${includedir}
 diff -ur DirectFB-1.0.0~org/lib/fusion/fusion.pc.in DirectFB-1.0.0/lib/fusion/fusion.pc.in
 --- DirectFB-1.0.0~org/lib/fusion/fusion.pc.in	2004-05-19 07:30:56.000000000 -0400
 +++ DirectFB-1.0.0/lib/fusion/fusion.pc.in	2007-03-16 22:32:34.000000000 -0400
@@ -33,7 +33,7 @@ diff -ur DirectFB-1.0.0~org/lib/fusion/fusion.pc.in DirectFB-1.0.0/lib/fusion/fu
  Requires: direct
  Libs: -L${libdir} -lfusion
 -Cflags: -I@INCLUDEDIR@
-+Cflags: -I${includedir}
++Cflags: -I${includedir}/directfb -I${includedir}
 diff -ur DirectFB-1.0.0~org/lib/voodoo/voodoo.pc.in DirectFB-1.0.0/lib/voodoo/voodoo.pc.in
 --- DirectFB-1.0.0~org/lib/voodoo/voodoo.pc.in	2004-05-19 07:31:28.000000000 -0400
 +++ DirectFB-1.0.0/lib/voodoo/voodoo.pc.in	2007-03-16 22:32:55.000000000 -0400
@@ -42,4 +42,4 @@ diff -ur DirectFB-1.0.0~org/lib/voodoo/voodoo.pc.in DirectFB-1.0.0/lib/voodoo/vo
  Requires: direct
  Libs: -L${libdir} -lvoodoo
 -Cflags: -I@INCLUDEDIR@
-+Cflags: -I${includedir}
++Cflags: -I${includedir}/directfb -I${includedir}
-- 
cgit v1.2.3


From 4114355b69f0deee2b79db35fd5a1fb9ed61d280 Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Mon, 10 Dec 2007 19:56:13 +0000
Subject: add python-pydirectfb, Python bindings to DirectFB

---
 conf/distro/include/sane-srcdates.inc    |  1 +
 packages/python/python-pydirectfb_cvs.bb | 14 ++++++++++++++
 packages/tasks/task-python-everything.bb |  3 ++-
 3 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 packages/python/python-pydirectfb_cvs.bb

diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc
index 4d9509fc15..b3b47093b7 100644
--- a/conf/distro/include/sane-srcdates.inc
+++ b/conf/distro/include/sane-srcdates.inc
@@ -112,6 +112,7 @@ SRCDATE_exquisite ?= "${EFL_SRCDATE}"
 # Misc packages, sorted by alphabet
 SRCDATE_avetanabt ?= "20060814"
 SRCDATE_bl ?= "20060814"
+SRCDATE_python-pydirectfb = "20071210"
 SRCDATE_dvbstream ?= "20060814"
 SRCDATE_dvbtraffic ?= "20060814"
 SRCDATE_dvbtune ?= "20060814"
diff --git a/packages/python/python-pydirectfb_cvs.bb b/packages/python/python-pydirectfb_cvs.bb
new file mode 100644
index 0000000000..cc0f3cfcd9
--- /dev/null
+++ b/packages/python/python-pydirectfb_cvs.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "DirectFB Bindings"
+SECTION = "devel/python"
+PRIORITY = "optional"
+LICENSE = "GPL"
+SRCNAME = "pydirectfb"
+PV = "0.0.0+cvs${SRCDATE}"
+PR = "ml0"
+
+SRC_URI = "cvs://anonymous@pydirectfb.cvs.sourceforge.net/cvsroot/pydirectfb;module=pydirectfb \
+           file://fix-directfb-detection.patch;patch=1"
+S = "${WORKDIR}/${SRCNAME}"
+
+inherit distutils
+	
diff --git a/packages/tasks/task-python-everything.bb b/packages/tasks/task-python-everything.bb
index a1d9f444b1..c81691cd34 100644
--- a/packages/tasks/task-python-everything.bb
+++ b/packages/tasks/task-python-everything.bb
@@ -1,7 +1,7 @@
 DESCRIPTION= "Everything Python"
 HOMEPAGE = "http://www.vanille.de/projects/python.spy"
 LICENSE = "MIT"
-PR = "ml21"
+PR = "ml22"
 
 RDEPENDS = "\
 		python-ao 		\
@@ -9,6 +9,7 @@ RDEPENDS = "\
 		python-constraint	\
 		python-dbus			\
 		python-dialog		\
+		python-directfb		\
 		python-efl			\
 		python-pycurl		\
 		python-fam			\
-- 
cgit v1.2.3


From 2e66df82e8d11701041c0f35f8551718023f66d1 Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Mon, 10 Dec 2007 20:52:22 +0000
Subject: python-pygtk 2.10.4 python-pycairo is actually a build time
 dependency

---
 packages/python/python-pygtk_2.10.4.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/python/python-pygtk_2.10.4.bb b/packages/python/python-pygtk_2.10.4.bb
index d53e3d5105..9b4a034ffa 100644
--- a/packages/python/python-pygtk_2.10.4.bb
+++ b/packages/python/python-pygtk_2.10.4.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Python GTK+ 2.10.x Bindings"
 SECTION = "devel/python"
 # needs gtk+ 2.10.x
-DEPENDS = "gtk+ libglade"
+DEPENDS = "gtk+ libglade python-pycairo"
 RDEPENDS = "python-shell python-pycairo python-pygobject"
 PROVIDES = "python-pygtk2"
 SRCNAME = "pygtk"
-- 
cgit v1.2.3


From 5a68820fe7b519acf0b10e34dce04ae70c67c0d3 Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Mon, 10 Dec 2007 23:50:26 +0000
Subject: linux-openmoko.inc: catch up with naming changes in linux.inc (hey,
 you could as well have adjusted linux-openmoko.inc while you were doing
 it...)

---
 packages/linux/linux-openmoko.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/linux/linux-openmoko.inc b/packages/linux/linux-openmoko.inc
index fc4a547fd7..d08169999c 100644
--- a/packages/linux/linux-openmoko.inc
+++ b/packages/linux/linux-openmoko.inc
@@ -1,8 +1,8 @@
 # extra stuff we need for openmoko that is not in linux.inc
 
 do_deploy_append() {
-	mv ${DEPLOY_DIR_IMAGE}/modules-${KERNEL_RELEASE}-${PR}-${MACHINE}.tgz ${DEPLOY_DIR_IMAGE}/modules-${PV}-${PR}-${MACHINE_CLASS}.tgz
-	mv ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}-${DATETIME}.bin ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE_CLASS}.bin
+	mv ${DEPLOY_DIR_IMAGE}/modules-${PV}-${PR}-${MACHINE}.tgz ${DEPLOY_DIR_IMAGE}/modules-${PV}-${PR}-${MACHINE_CLASS}.tgz
+	mv ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}.bin ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE_CLASS}.bin
 	rm -f ${KERNEL_IMAGE_SYMLINK_NAME}.bin
 	ln -sf ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE_CLASS}.bin ${DEPLOY_DIR_IMAGE}/uImage-${MACHINE_CLASS}-latest.bin
 }
-- 
cgit v1.2.3


From c644668e3ff839df99c1a417c62c6444b87e6432 Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Tue, 11 Dec 2007 03:28:53 +0000
Subject: directfb: refactor commonalities into directfb.inc, bring back 1.0.0

---
 packages/directfb/directfb.inc      | 76 +++++++++++++++++++++++++++++++++++++
 packages/directfb/directfb_1.0.0.bb |  4 ++
 packages/directfb/directfb_1.1.0.bb | 76 +------------------------------------
 3 files changed, 82 insertions(+), 74 deletions(-)
 create mode 100644 packages/directfb/directfb.inc
 create mode 100644 packages/directfb/directfb_1.0.0.bb

diff --git a/packages/directfb/directfb.inc b/packages/directfb/directfb.inc
new file mode 100644
index 0000000000..0843f36198
--- /dev/null
+++ b/packages/directfb/directfb.inc
@@ -0,0 +1,76 @@
+DESCRIPTION = "DirectFB is a thin library that provides developers \
+with hardware graphics acceleration, input device handling and \
+abstraction, an integrated windowing system with support for \
+translucent windows and multiple display layers on top of the \
+Linux framebuffer device."
+SECTION = "libs"
+LICENSE = "LGPL"
+HOMEPAGE = "http://directfb.org"
+DEPENDS = "jpeg libpng freetype zlib tslib"
+RV = "1.0-0"
+PR = "r4"
+
+SRC_URI = " \
+    http://www.directfb.org/download/DirectFB/DirectFB-${PV}.tar.gz \
+    file://fix-pkgconfig-cflags.patch;patch=1 \
+    file://fix-font-missing-char.patch;patch=1 \
+    file://getpagesize.patch;patch=1 \
+    file://fix-includes.patch;patch=1 \
+    file://mkdfiff.patch;patch=1 \
+"
+S = "${WORKDIR}/DirectFB-${PV}"
+
+LDFLAGS_append =" -lts -lm"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "\
+  --with-gfxdrivers=none \
+  --enable-libmpeg3=no \
+  --enable-freetype=yes \
+  --enable-sdl=no \
+  --enable-vnc=no \
+  --disable-x11 \
+"
+
+do_stage() {
+        autotools_stage_all
+}
+
+do_install() {
+        oe_runmake 'DESTDIR=${D}' install
+}
+
+
+#PACKAGES_DYNAMIC = "directfb-inputdrivers-*"
+#
+#python populate_packages_prepend () {
+#    import os.path
+#    inputdrivers_libdir = bb.data.expand('${libdir}/directfb-${RV}/inputdrivers', d)
+#    do_split_packages(d, inputdrivers_libdir, '*.so$', 'directfb-inputdrivers-%s', 'Directfb plugin for %s')
+#}
+
+# NOTE: monolithic packaging for now, should improve that eventually
+
+
+
+FILES_${PN}-dbg += "\
+  ${libdir}/directfb-${RV}/*/*/.debug/*.so \
+  ${libdir}/directfb-${RV}/*/.debug/*.so \
+"
+
+FILES_${PN}-dev += "\
+  ${bindir}/directfb-config \
+  ${libdir}/directfb-${RV}/systems/*.la \
+  ${libdir}/directfb-${RV}/inputdrivers/*.la \
+  ${libdir}/directfb-${RV}/interfaces/*/*.la \
+  ${libdir}/directfb-${RV}/wm/*.la \
+"
+
+FILES_${PN} += "\
+  ${libdir}/directfb-${RV}/systems/*.so \
+  ${libdir}/directfb-${RV}/inputdrivers/*.so \
+  ${libdir}/directfb-${RV}/interfaces/*/*.so \
+  ${libdir}/directfb-${RV}/wm/*.so \
+  ${datadir}/directfb-${PV} \
+"
diff --git a/packages/directfb/directfb_1.0.0.bb b/packages/directfb/directfb_1.0.0.bb
new file mode 100644
index 0000000000..5b4690fe93
--- /dev/null
+++ b/packages/directfb/directfb_1.0.0.bb
@@ -0,0 +1,4 @@
+require directfb.inc
+
+RV = "1.0-0"
+PR = "r4"
diff --git a/packages/directfb/directfb_1.1.0.bb b/packages/directfb/directfb_1.1.0.bb
index 8fe4fd418a..39002fdb5d 100644
--- a/packages/directfb/directfb_1.1.0.bb
+++ b/packages/directfb/directfb_1.1.0.bb
@@ -1,76 +1,4 @@
-DESCRIPTION = "DirectFB is a thin library that provides developers \
-with hardware graphics acceleration, input device handling and \
-abstraction, an integrated windowing system with support for \
-translucent windows and multiple display layers on top of the \
-Linux framebuffer device."
-SECTION = "libs"
-LICENSE = "LGPL"
-HOMEPAGE = "http://directfb.org"
-DEPENDS = "jpeg libpng freetype zlib tslib"
+require directfb.inc
+
 RV = "1.1-0"
 PR = "r3"
-
-SRC_URI = " \
-    http://www.directfb.org/download/DirectFB/DirectFB-${PV}.tar.gz \
-    file://fix-pkgconfig-cflags.patch;patch=1 \
-    file://fix-font-missing-char.patch;patch=1 \
-    file://getpagesize.patch;patch=1 \
-    file://fix-includes.patch;patch=1 \
-    file://mkdfiff.patch;patch=1 \
-"
-S = "${WORKDIR}/DirectFB-${PV}"
-
-LDFLAGS_append =" -lts -lm"
-
-inherit autotools pkgconfig
-
-EXTRA_OECONF = "\
-  --with-gfxdrivers=none \
-  --enable-libmpeg3=no \
-  --enable-freetype=yes \
-  --enable-sdl=no \
-  --enable-vnc=no \
-  --disable-x11 \
-"
-
-do_stage() {
-        autotools_stage_all
-}
-
-do_install() {
-        oe_runmake 'DESTDIR=${D}' install
-}
-
-
-#PACKAGES_DYNAMIC = "directfb-inputdrivers-*"
-#
-#python populate_packages_prepend () {
-#    import os.path
-#    inputdrivers_libdir = bb.data.expand('${libdir}/directfb-${RV}/inputdrivers', d)
-#    do_split_packages(d, inputdrivers_libdir, '*.so$', 'directfb-inputdrivers-%s', 'Directfb plugin for %s')
-#}
-
-# NOTE: monolithic packaging for now, should improve that eventually
-
-
-
-FILES_${PN}-dbg += "\
-  ${libdir}/directfb-${RV}/*/*/.debug/*.so \
-  ${libdir}/directfb-${RV}/*/.debug/*.so \
-"
-
-FILES_${PN}-dev += "\
-  ${bindir}/directfb-config \
-  ${libdir}/directfb-${RV}/systems/*.la \
-  ${libdir}/directfb-${RV}/inputdrivers/*.la \
-  ${libdir}/directfb-${RV}/interfaces/*/*.la \
-  ${libdir}/directfb-${RV}/wm/*.la \
-"
-
-FILES_${PN} += "\
-  ${libdir}/directfb-${RV}/systems/*.so \
-  ${libdir}/directfb-${RV}/inputdrivers/*.so \
-  ${libdir}/directfb-${RV}/interfaces/*/*.so \
-  ${libdir}/directfb-${RV}/wm/*.so \
-  ${datadir}/directfb-${PV} \
-"
-- 
cgit v1.2.3


From 8483b7301dc68c0e5ffc5c7157b723f5a0a0fdeb Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Tue, 11 Dec 2007 08:57:12 +0000
Subject: zaurus-updater: do not run shell at the end - reboot instead

---
 packages/zaurus-updater/zaurus-updater.bb         | 2 +-
 packages/zaurus-updater/zaurus-updater/updater.sh | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/packages/zaurus-updater/zaurus-updater.bb b/packages/zaurus-updater/zaurus-updater.bb
index ecf713d32c..f98ece35d7 100644
--- a/packages/zaurus-updater/zaurus-updater.bb
+++ b/packages/zaurus-updater/zaurus-updater.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Encrypted shellscript for the Zaurus ROM update"
 DEPENDS = "encdec-updater-native"
 LICENSE = "zaurus-updater"
-PR = "r17"
+PR = "r18"
 
 PACKAGES = ""
 PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/packages/zaurus-updater/zaurus-updater/updater.sh b/packages/zaurus-updater/zaurus-updater/updater.sh
index 26848cd5a7..2efa946f6c 100644
--- a/packages/zaurus-updater/zaurus-updater/updater.sh
+++ b/packages/zaurus-updater/zaurus-updater/updater.sh
@@ -375,9 +375,6 @@ do
     esac
 done
 
-# starting shell to test -- remove this from final release
-/bin/sh
-
 # reboot
 exit 0
 
-- 
cgit v1.2.3


From 6ad5b8ff68141976206bf0e04492247dedfd6645 Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Tue, 11 Dec 2007 10:00:09 +0000
Subject: rootfs_deb.bbclass: few fixes to get it working

---
 classes/rootfs_deb.bbclass | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/classes/rootfs_deb.bbclass b/classes/rootfs_deb.bbclass
index 935ef6e3f7..853ea225fc 100644
--- a/classes/rootfs_deb.bbclass
+++ b/classes/rootfs_deb.bbclass
@@ -10,8 +10,12 @@ fakeroot rootfs_deb_do_rootfs () {
 	mkdir -p ${IMAGE_ROOTFS}/var/dpkg/info
 	mkdir -p ${IMAGE_ROOTFS}/var/dpkg/updates
 
+	mkdir -p ${STAGING_ETCDIR_NATIVE}/apt/
+
 	rm -f ${STAGING_ETCDIR_NATIVE}/apt/sources.list.rev
 	rm -f ${STAGING_ETCDIR_NATIVE}/apt/preferences
+	> ${STAGING_ETCDIR_NATIVE}/apt/sources.list.rev
+	> ${STAGING_ETCDIR_NATIVE}/apt/preferences
 	> ${IMAGE_ROOTFS}/var/dpkg/status
 	> ${IMAGE_ROOTFS}/var/dpkg/available
 	# > ${STAGING_DIR}/var/dpkg/status
@@ -36,9 +40,9 @@ fakeroot rootfs_deb_do_rootfs () {
 		priority=$(expr $priority + 5)
 	done
 
-	tac ${STAGING_ETCDIR_NATIVE}/apt/sources.list.rev > ${STAGING_ETCDIR_NATIVE}/apt/sources.list
+	tac ${STAGING_ETCDIR_NATIVE}/apt/sources.list.rev > ${STAGING_DIR}/etc/apt/sources.list
 
-	cat "${STAGING_ETCDIR_NATIVE}/apt/apt.conf.sample" \
+	cat "${STAGING_DIR}/etc/apt/apt.conf.sample" \
 		| sed -e 's#Architecture ".*";#Architecture "${TARGET_ARCH}";#' \
 		> "${STAGING_ETCDIR_NATIVE}/apt/apt-rootfs.conf"
 
-- 
cgit v1.2.3


From 1ab609f02b1be52e60fa3944953cebcc53740189 Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Tue, 11 Dec 2007 10:16:02 +0000
Subject: matchbox-keyboard-inputmethod: fix RCONFLICTS to get openmoko-image
 built

---
 packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb b/packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb
index 5b6ea4edfa..e9b9b5130a 100644
--- a/packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb
+++ b/packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb
@@ -1,12 +1,12 @@
 DESCRIPTION = "Matchbox virtual keyboard for X11"
 LICENSE = "GPL"
 DEPENDS = "libfakekey expat libxft gtk+ matchbox-panel-2"
-RCONFLICTS = matchbox-keyboard
-RPROVIDES_${PN} = matchbox-keyboard
+RCONFLICTS_${PN} = "matchbox-keyboard"
+RPROVIDES_${PN} = "matchbox-keyboard"
 #DEFAULT_PREFERENCE = "-1"
 SECTION = "x11"
 PV = "0.0+svnr${SRCREV}"
-PR = "r7"
+PR = "r8"
 
 SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=matchbox-keyboard;proto=http \
 	file://smallscreen-fontsize.patch;patch=1 \
-- 
cgit v1.2.3


From b825ea3703438e811a8d55e2bbea5254e3bd6881 Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Tue, 11 Dec 2007 11:19:51 +0000
Subject: curl: really disable libidn (from Poky)

---
 packages/curl/curl_7.16.4.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/curl/curl_7.16.4.bb b/packages/curl/curl_7.16.4.bb
index f59d32d17a..ce6175b419 100644
--- a/packages/curl/curl_7.16.4.bb
+++ b/packages/curl/curl_7.16.4.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Command line tool and library for client-side URL transfers."
 LICENSE = "MIT"
 DEPENDS = "zlib gnutls"
 SECTION = "console/network"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2"
 S = "${WORKDIR}/curl-${PV}"
@@ -13,7 +13,7 @@ EXTRA_OECONF = "--with-zlib=${STAGING_LIBDIR}/../ \
                 --with-gnutls=${STAGING_BINDIR_CROSS}/ \
                 --without-ssl \
 		--with-random=/dev/urandom \
-		--without-idn \
+		--without-libidn \
 		--enable-crypto-auth \
 		"
 
-- 
cgit v1.2.3


From 843ecca5c576542e407919aa719b23ffb89cfc15 Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Tue, 11 Dec 2007 12:41:43 +0000
Subject: python-pydirectfb: commit missing patch

---
 packages/python/python-pydirectfb/.mtn2git_empty         |  0
 .../python-pydirectfb/fix-directfb-detection.patch       | 16 ++++++++++++++++
 2 files changed, 16 insertions(+)
 create mode 100644 packages/python/python-pydirectfb/.mtn2git_empty
 create mode 100644 packages/python/python-pydirectfb/fix-directfb-detection.patch

diff --git a/packages/python/python-pydirectfb/.mtn2git_empty b/packages/python/python-pydirectfb/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/python/python-pydirectfb/fix-directfb-detection.patch b/packages/python/python-pydirectfb/fix-directfb-detection.patch
new file mode 100644
index 0000000000..c8b7cc805a
--- /dev/null
+++ b/packages/python/python-pydirectfb/fix-directfb-detection.patch
@@ -0,0 +1,16 @@
+Index: pydirectfb/setup.py
+===================================================================
+--- pydirectfb.orig/setup.py
++++ pydirectfb/setup.py
+@@ -11,9 +11,10 @@
+     Check dependencies add add the flags to include_dirs, library_dirs and
+     libraries. The basic logic is taken from pygame.
+     """
+-    command = name + '-config --version --cflags --libs 2>/dev/null'
++    command = 'pkg-config %s --modversion --cflags --libs 2>/dev/null' % name
+     try:
+         config = os.popen(command).readlines()
++        print config
+         if len(config) == 0:
+             raise ValueError, 'command not found'
+         flags  = (' '.join(config[1:]) + ' ').split()
-- 
cgit v1.2.3


From af52482a8bb96828926d46cd5a6300b46d38cb88 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Tue, 11 Dec 2007 13:11:16 +0000
Subject: mysql: workaround two problems: * mysql dislikes parallel
 compilation, so set PARALLEL_MAKE = "" * the mysql-native helper binaries
 reference ${WORKDIR}, so implement a custom, empty do_rm_work() method This
 will need further thought when packaged-staging(2) is used

---
 packages/mysql/mysql-native_4.1.18.bb | 8 +++++++-
 packages/mysql/mysql_4.1.18.bb        | 1 +
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/packages/mysql/mysql-native_4.1.18.bb b/packages/mysql/mysql-native_4.1.18.bb
index 9a81bc8f00..83f9dac0e3 100644
--- a/packages/mysql/mysql-native_4.1.18.bb
+++ b/packages/mysql/mysql-native_4.1.18.bb
@@ -1,7 +1,7 @@
 SECTION = "console/network"
 require mysql_${PV}.bb
 inherit native
-PR="r3"
+PR="r4"
 
 RDEPENDS_${PN} = ""
 
@@ -17,3 +17,9 @@ do_stage_append() {
 do_install() {
 	:
 }
+
+
+# Mysql tries to access the ${WORKDIR} from this build..
+do_rm_work() {
+       :
+}
diff --git a/packages/mysql/mysql_4.1.18.bb b/packages/mysql/mysql_4.1.18.bb
index 17fa33ac1c..b509b81311 100644
--- a/packages/mysql/mysql_4.1.18.bb
+++ b/packages/mysql/mysql_4.1.18.bb
@@ -23,6 +23,7 @@ INITSCRIPT_PACKAGES = "mysql-server"
 INITSCRIPT_NAME = "mysqld"
 INITSCRIPT_PARAMS = "start 45 S . stop 45 0 6 1 ."
 
+PARALLEL_MAKE = " "
 EXTRA_OEMAKE = "'GEN_LEX_HASH=${STAGING_BINDIR_NATIVE}/gen_lex_hash'"
 EXTRA_OECONF = " --with-embedded-server --prefix=/usr --sysconfdir=/etc/mysql --localstatedir=/var/mysql --datadir=/var/mysql --disable-dependency-tracking --without-raid --without-debug --with-low-memory --without-query-cache --without-man --without-docs --without-innodb "
 
-- 
cgit v1.2.3


From 75273832778601f980417a99efcb02c5bb484f9e Mon Sep 17 00:00:00 2001
From: Robert Schuster <thebohemian@gmx.net>
Date: Tue, 11 Dec 2007 13:51:34 +0000
Subject: pulse: build hal-detect. Closes #3297 Currently OE's pulseaudio
 recipe does not build pulseaudio's hal-detect module. The attached patch adds
 hal to the dependencies and activates the configure switch. For what
 hal-detect is neccessary? If you plug in a USB headset to your device a
 pulseaudio server with the hal-detect module will automatically create a sink
 (and source) for the headset. In theory this should also work for bluetooth
 devices but I don't have the hardware to test that.

---
 packages/pulseaudio/pulse.inc           | 3 ++-
 packages/pulseaudio/pulseaudio_0.9.6.bb | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/pulseaudio/pulse.inc b/packages/pulseaudio/pulse.inc
index 08b0b5cd14..b6b622d9c6 100644
--- a/packages/pulseaudio/pulse.inc
+++ b/packages/pulseaudio/pulse.inc
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.pulseaudio.org"
 AUTHOR = "Lennart Poettering"
 SECTION = "libs/multimedia"
 LICENSE = "LGPL"
-DEPENDS = "libatomics-ops liboil avahi libsamplerate0 libsndfile1 libtool"
+DEPENDS = "libatomics-ops liboil avahi libsamplerate0 libsndfile1 libtool hal"
 # optional
 DEPENDS += "alsa-lib glib-2.0"
 
@@ -20,6 +20,7 @@ EXTRA_OECONF = "\
 		--with-glib \
 		--with-alsa \
 		--with-oss \
+                --with-hal \
 		"
 
 PARALLEL_MAKE = ""
diff --git a/packages/pulseaudio/pulseaudio_0.9.6.bb b/packages/pulseaudio/pulseaudio_0.9.6.bb
index a93c8ee251..aa07afe6fe 100644
--- a/packages/pulseaudio/pulseaudio_0.9.6.bb
+++ b/packages/pulseaudio/pulseaudio_0.9.6.bb
@@ -1,4 +1,4 @@
 require pulse.inc
 
-PR = "r5"
+PR = "r6"
 
-- 
cgit v1.2.3


From 75f4776444c3f9166056946a305e0bb491168054 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Tue, 11 Dec 2007 13:53:43 +0000
Subject: angstrom-feed-configs: add iwmmxt feeds for machine that have
 'iwmmxt' as MACHINE_FEATURE * Currently mplayer is the only iwmmxt package,
 since that's the only package for which people have *proven* iwmmxt improved
 performance

---
 packages/angstrom/angstrom-feed-configs.bb | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/packages/angstrom/angstrom-feed-configs.bb b/packages/angstrom/angstrom-feed-configs.bb
index 9d94747179..1415080fbd 100644
--- a/packages/angstrom/angstrom-feed-configs.bb
+++ b/packages/angstrom/angstrom-feed-configs.bb
@@ -1,11 +1,13 @@
 DESCRIPTION = "Configuration files for online package repositories aka feeds"
 
 #PV = "${DISTRO_VERSION}"
-PR = "r2"
+PR = "r3"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 FEED_BASEPATH ?= "unstable/feed/"
 
+IWMMXT_FEED = "${@base_contains('MACHINE_FEATURES', 'iwmmxt', 'iwmmxt', '',d)}"
+
 do_compile() {
         mkdir -p ${S}/${sysconfdir}/ipkg
 	for feed in base debug perl python gstreamer ; do
@@ -14,6 +16,11 @@ do_compile() {
 
         echo "src/gz ${MACHINE_ARCH} ${ANGSTROM_URI}/${FEED_BASEPATH}${FEED_ARCH}/machine/${MACHINE_ARCH}" >  ${S}/${sysconfdir}/ipkg/${MACHINE_ARCH}-feed.conf
 	echo "src/gz no-arch ${ANGSTROM_URI}/${FEED_BASEPATH}/all" > ${S}/${sysconfdir}/ipkg/noarch-feed.conf
+        
+	# iwmmxt is a special case, add the iwmmxt feed for machine that have 'iwmmxt' in MACHINE_FEATURES
+        if [ "${IWMMXT_FEED}" = "iwmmxt" ] ; then
+	  echo "src/gz iwmmxt ${ANGSTROM_URI}/${FEED_BASEPATH}iwmmxt/base" > ${S}/${sysconfdir}/ipkg/iwmmxt-feed.conf
+	fi  
 }
 
 
-- 
cgit v1.2.3


From d179303dd0bb1fc76ac71da5defe8251e065385c Mon Sep 17 00:00:00 2001
From: Sergey Lapin <slapinid@gmail.com>
Date: Tue, 11 Dec 2007 16:44:03 +0000
Subject: linux-hackndev: Since we support git:// protocol now, use it by
 default

---
 packages/linux/linux-hackndev-2.6_git.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/linux/linux-hackndev-2.6_git.bb b/packages/linux/linux-hackndev-2.6_git.bb
index 750be1a648..2d2a37f716 100644
--- a/packages/linux/linux-hackndev-2.6_git.bb
+++ b/packages/linux/linux-hackndev-2.6_git.bb
@@ -2,11 +2,11 @@ DESCRIPTION = "Hack&Dev's Linux kernel for Palm devices."
 HOMEPAGE = "http://www.hackndev.com/"
 SECTION = "kernel"
 LICENSE = "GPL"
-PR = "r12"
+PR = "r13"
 
 COMPATIBLE_MACHINE = "(palmld|palmtc|palmtt3|palmtt5|palmtx|palmz31|palmz72|palmt650)"
 
-SRC_URI = "git://git.hackndev.com/git/linux-hnd;protocol=http \
+SRC_URI = "git://git.hackndev.com/git/linux-hnd;protocol=git \
 	   file://defconfig"
 
 SRC_URI_append_palmtx += "http://www.busybox.net/downloads/busybox-1.1.0.tar.bz2 \
-- 
cgit v1.2.3


From 3d7691139658cbf76577f0a3cde86b07dcd6d14b Mon Sep 17 00:00:00 2001
From: Openmoko anonymizer key <devel@lists.openmoko.org>
Date: Tue, 11 Dec 2007 16:49:11 +0000
Subject: change to rev 3630.

---
 packages/openmoko-spaces/openmoko-toolchain-scripts_svn.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/openmoko-spaces/openmoko-toolchain-scripts_svn.bb b/packages/openmoko-spaces/openmoko-toolchain-scripts_svn.bb
index b96cf8fa74..1526cbab55 100644
--- a/packages/openmoko-spaces/openmoko-toolchain-scripts_svn.bb
+++ b/packages/openmoko-spaces/openmoko-toolchain-scripts_svn.bb
@@ -4,7 +4,7 @@ PACKAGE_ARCH = "all"
 SRC_URI = "svn://svn.openmoko.org/developers/john_lee;module=toolkit;proto=http"
 SRC_URI += "svn://svn.openmoko.org/trunk/src/target/OM-2007.2/applications;module=openmoko-sample2;proto=http"
 
-SRCREV="3563"
+SRCREV="3630"
 FILES_${PN} = "/"
 
 do_install () {
-- 
cgit v1.2.3


From 6667887bc56cc95e8b217c596c7037c9c4a8fb09 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Tue, 11 Dec 2007 20:21:46 +0000
Subject: minimal-gpe-image: add images that only offers a basic 'desktop'
 compared to other images: 3.3M   
 Angstrom-minimalist-image-glibc-ipk-2007.9-test-20071211-collie.rootfs.tar.gz
 8.5M   
 Angstrom-console-image-glibc-ipk-2007.9-test-20071211-collie.rootfs.tar.gz
 11M    
 Angstrom-minimalist-gpe-image-glibc-ipk-2007.9-test-20071211-collie.rootfs.tar.gz
 17M    
 Angstrom-x11-image-glibc-ipk-2007.9-test-20071211-collie.rootfs.tar.gz

---
 packages/images/minimal-gpe-image.bb | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 packages/images/minimal-gpe-image.bb

diff --git a/packages/images/minimal-gpe-image.bb b/packages/images/minimal-gpe-image.bb
new file mode 100644
index 0000000000..356070f5f8
--- /dev/null
+++ b/packages/images/minimal-gpe-image.bb
@@ -0,0 +1,22 @@
+#Angstrom minimal gpe image
+# This image provides a barebone dm and 'desktop' 
+# Very angstrom and ipkg centric
+
+XSERVER ?= "xserver-kdrive-fbdev"
+
+export IMAGE_BASENAME = "minimalist-gpe-image"
+
+DEPENDS = "task-boot"
+IMAGE_INSTALL = "\
+    ${XSERVER} \
+    task-boot \
+    gpe-session-scripts gpe-login \
+    matchbox-wm \
+    angstrom-feed-configs \
+    ipkg \
+    "
+
+#zap root password for release images
+ROOTFS_POSTPROCESS_COMMAND += '${@base_conditional("DISTRO_TYPE", "release", "zap_root_password; ", "",d)}'
+
+inherit image
-- 
cgit v1.2.3


From 9eecd549fc01c25b3ea788fd1fa5edb339dc3f75 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Tue, 11 Dec 2007 20:22:38 +0000
Subject: collie-2.6.inc: copy installkit code from zaurus-2.6.inc

---
 conf/machine/include/collie-2.6.inc | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/conf/machine/include/collie-2.6.inc b/conf/machine/include/collie-2.6.inc
index f22ffce6c2..36b01c7ef2 100644
--- a/conf/machine/include/collie-2.6.inc
+++ b/conf/machine/include/collie-2.6.inc
@@ -4,3 +4,30 @@ SERIAL_CONSOLE = "115200 ttySA0"
 MACHINE_FEATURES = "kernel26 apm pcmcia screen irda usbgadget keyboard touchscreen wifi"
 
 MACHINE_EXTRA_RDEPENDS = "kernel-modules"
+
+MACHINE_POSTPROCESS_COMMAND = "zaurus_make_installkit"
+
+zaurus_make_installkit () {
+    cd ${DEPLOY_DIR_IMAGE}
+    rm -rf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit/
+    mkdir ${IMAGE_NAME}-installkit/
+    # Get the latest kernel using the zImage-<machine>.bin symlink
+    cp zImage-${MACHINE}.bin ${IMAGE_NAME}-installkit/zImage.bin
+    if [ "${MACHINE}" = "spitz" ]; then
+        cp gnu-tar ${IMAGE_NAME}-installkit/
+        cp ${IMAGE_NAME}.rootfs.tar.gz ${IMAGE_NAME}-installkit/hdimage1.tgz
+    else
+        [ -f ${IMAGE_NAME}.rootfs.jffs2 ] && cp ${IMAGE_NAME}.rootfs.jffs2 ${IMAGE_NAME}-installkit/initrd.bin
+    fi
+
+    # All zaurus machines except collie need updater.sh
+    if [ "${MACHINE}" != "collie" ]; then
+        cp updater.sh.${MACHINE} ${IMAGE_NAME}-installkit/updater.sh
+    fi
+
+    tar czf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit.tgz ${IMAGE_NAME}-installkit/
+    md5sum ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit.tgz > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit.tgz.md5
+    rm -rf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit/
+}
+
+
-- 
cgit v1.2.3


From ef8ac22cb3ff5c7e0e1fa963a542db62bcf919ce Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <pmiscml@gmail.com>
Date: Tue, 11 Dec 2007 20:56:23 +0000
Subject: matchbox-keyboard-inputmethod svn: Apply multiple-layouts patches. *
 Just the same as matchbox-keyboard. * Actually, this is adhox workaround for
 non-determinism in image building (when ipkg, having matchbox-keyboard and
 matchbox-keyboard-inputmethod, both Provide'ing each other, selects some
 non-deterministically).

---
 packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb b/packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb
index e9b9b5130a..2b84a19bd7 100644
--- a/packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb
+++ b/packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb
@@ -6,10 +6,15 @@ RPROVIDES_${PN} = "matchbox-keyboard"
 #DEFAULT_PREFERENCE = "-1"
 SECTION = "x11"
 PV = "0.0+svnr${SRCREV}"
-PR = "r8"
+PR = "r9"
 
 SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=matchbox-keyboard;proto=http \
 	file://smallscreen-fontsize.patch;patch=1 \
+        file://2-Add-new-modifier--layout--Used-to-cycle-thru-all-available-layouts.patch;patch=1 \
+        file://3-Changes-to-improve-layout-rendering--especially-after-adding-support-for.patch;patch=1 \
+        file://4-Add-rendering-debug-logging.patch;patch=1 \
+        file://5-Add-support-for-loading-multiple-independent-layouts.patch;patch=1 \
+        file://6-Add-layout-switch-key-to-all-layouts.patch;patch=1 \
 	file://80matchboxkeyboard"
 
 SRC_URI_append_fic-gta01 = " file://fic-gta01-font-size.patch;patch=1"
-- 
cgit v1.2.3


From 812558dd82b698b00fb0e82f7528cf6536f2a39b Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <pmiscml@gmail.com>
Date: Tue, 11 Dec 2007 22:12:09 +0000
Subject: angstrom-2007.1.conf: Use bluez 3.23. * Fixes #3458, timeout while
 getting bluetooth device names.

---
 conf/distro/angstrom-2007.1.conf                         |  2 +-
 conf/distro/include/angstrom-2007-preferred-versions.inc | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index 4c9a254cd9..2860f55854 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -8,7 +8,7 @@
 
 #DISTRO_VERSION = "2007.9"
 DISTRO_VERSION = "2007.9-test-${DATE}"
-DISTRO_REVISION = "46"
+DISTRO_REVISION = "47"
 
 require conf/distro/include/sane-srcdates.inc
 require conf/distro/include/sane-srcrevs.inc
diff --git a/conf/distro/include/angstrom-2007-preferred-versions.inc b/conf/distro/include/angstrom-2007-preferred-versions.inc
index 72533c65e5..e0989b481f 100644
--- a/conf/distro/include/angstrom-2007-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2007-preferred-versions.inc
@@ -97,14 +97,14 @@ PREFERRED_VERSION_bison-native ?= "2.0"
 PREFERRED_VERSION_bitbake ?= "1.8.6"
 PREFERRED_VERSION_bitchx ?= "1.1"
 PREFERRED_VERSION_bluesnarfer ?= "0.1"
-PREFERRED_VERSION_bluez-cups-backend ?= "3.22"
+PREFERRED_VERSION_bluez-cups-backend ?= "3.23"
 PREFERRED_VERSION_bluez-dtl1-workaround ?= "1.0"
 PREFERRED_VERSION_bluez-gnome ?= "0.14"
-PREFERRED_VERSION_bluez-gstreamer-plugin ?= "3.22"
+PREFERRED_VERSION_bluez-gstreamer-plugin ?= "3.23"
 PREFERRED_VERSION_bluez-hcidump ?= "1.38"
-PREFERRED_VERSION_bluez-libs ?= "3.22"
-PREFERRED_VERSION_bluez-utils ?= "3.22"
-PREFERRED_VERSION_bluez-utils-alsa ?= "3.22"
+PREFERRED_VERSION_bluez-libs ?= "3.23"
+PREFERRED_VERSION_bluez-utils ?= "3.23"
+PREFERRED_VERSION_bluez-utils-alsa ?= "3.23"
 PREFERRED_VERSION_bmon ?= "2.1.0"
 PREFERRED_VERSION_boa ?= "0.94.13"
 PREFERRED_VERSION_bochs ?= "2.1"
-- 
cgit v1.2.3


From 5536e857bd2761da75c50e77a292731a0e2a819b Mon Sep 17 00:00:00 2001
From: Philippe De Swert <philippedeswert@scarlet.be>
Date: Wed, 12 Dec 2007 00:10:01 +0000
Subject: gpe-mini-browser: fix QA issue with desktop file * added patch to fix
 up desktop file * bumped PR * Fixes bug #3445

---
 packages/gpe-mini-browser/files/.mtn2git_empty           |  0
 .../files/mini-browser-desktop-fix.patch                 | 16 ++++++++++++++++
 packages/gpe-mini-browser/gpe-mini-browser_0.21.bb       |  4 +++-
 3 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 packages/gpe-mini-browser/files/.mtn2git_empty
 create mode 100644 packages/gpe-mini-browser/files/mini-browser-desktop-fix.patch

diff --git a/packages/gpe-mini-browser/files/.mtn2git_empty b/packages/gpe-mini-browser/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/gpe-mini-browser/files/mini-browser-desktop-fix.patch b/packages/gpe-mini-browser/files/mini-browser-desktop-fix.patch
new file mode 100644
index 0000000000..4912abb23b
--- /dev/null
+++ b/packages/gpe-mini-browser/files/mini-browser-desktop-fix.patch
@@ -0,0 +1,16 @@
+--- gpe-mini-browser-0.21.old/gpe-mini-browser-0.21//gpe-mini-browser.desktop.in.in	2007-01-09 14:53:31.000000000 +0200
++++ gpe-mini-browser-0.21/gpe-mini-browser.desktop.in.in	2007-12-11 20:45:04.749584640 +0200
+@@ -2,9 +2,8 @@
+ _Name=Mini Web Browser
+ _Comment=Browse the web
+ Exec=gpe-mini-browser
+-Terminal=0
++Terminal=false
+ Type=Application
+-Icon=gpe-mini-browser.png
+-Categories=Application;PIM;GPE
+-StartupNotify=True
+-
++Icon=gpe-mini-browser
++Categories=X-GPE;X-PIM;X-Internet;X-Browser;
++StartupNotify=true
diff --git a/packages/gpe-mini-browser/gpe-mini-browser_0.21.bb b/packages/gpe-mini-browser/gpe-mini-browser_0.21.bb
index 20732ea5b2..2a9249818b 100644
--- a/packages/gpe-mini-browser/gpe-mini-browser_0.21.bb
+++ b/packages/gpe-mini-browser/gpe-mini-browser_0.21.bb
@@ -4,7 +4,9 @@ SRC_URI = "http://gpe.linuxtogo.org/download/source/gpe-mini-browser-${PV}.tar.g
 DEPENDS = "osb-nrcit sqlite libgpewidget"
 RRECOMMENDS = "gdk-pixbuf-loader-gif gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg"
 
-PR = "r0"
+PR = "r1"
+
+SRC_URI += "file://mini-browser-desktop-fix.patch;patch=0"
 
 S = "${WORKDIR}/gpe-mini-browser-${PV}"
 
-- 
cgit v1.2.3


From eb9ccd66d4850d975ce31a71296647aac3489493 Mon Sep 17 00:00:00 2001
From: John Lee <john_lee@openmoko.org>
Date: Wed, 12 Dec 2007 06:41:18 +0000
Subject: fix typo to make sourcepkg.bbclass work when inherited.
 sourcepkg.bbclass:109:addtask dumpdata after archive_bb before
 do_create_diff_gz archive_bb should be "do_archive_bb".

---
 classes/sourcepkg.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/sourcepkg.bbclass b/classes/sourcepkg.bbclass
index 390d3684d4..bbc9f187ec 100644
--- a/classes/sourcepkg.bbclass
+++ b/classes/sourcepkg.bbclass
@@ -106,6 +106,6 @@ EXPORT_FUNCTIONS do_create_orig_tgz do_archive_bb do_dumpdata do_create_diff_gz
 
 addtask create_orig_tgz after do_unpack before do_patch
 addtask archive_bb after do_patch before do_dumpdata
-addtask dumpdata after archive_bb before do_create_diff_gz
+addtask dumpdata after do_archive_bb before do_create_diff_gz
 addtask create_diff_gz after do_dump_data before do_configure
 
-- 
cgit v1.2.3


From f87df7d40d242fa23dabfe6c1307262ff33674b9 Mon Sep 17 00:00:00 2001
From: Junqian Gordon Xu <xjqian@gmail.com>
Date: Wed, 12 Dec 2007 07:07:43 +0000
Subject: angstrom-2007-preferred-versions.inc: prefer octave 2.1.73 (stable).
 * the old 2.9.14 never built * the new 2.9.x is still in testing

---
 conf/distro/include/angstrom-2007-preferred-versions.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/distro/include/angstrom-2007-preferred-versions.inc b/conf/distro/include/angstrom-2007-preferred-versions.inc
index e0989b481f..6a050cd755 100644
--- a/conf/distro/include/angstrom-2007-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2007-preferred-versions.inc
@@ -1352,7 +1352,7 @@ PREFERRED_VERSION_obby ?= "0.4.1"
 PREFERRED_VERSION_obexftp ?= "0.20"
 PREFERRED_VERSION_obexpush ?= "1.0.0"
 PREFERRED_VERSION_obexpush-native ?= "1.0.0"
-PREFERRED_VERSION_octave ?= "2.9.14"
+PREFERRED_VERSION_octave ?= "2.1.73"
 PREFERRED_VERSION_offlineimap ?= "4.0.14"
 PREFERRED_VERSION_olsr ?= "0.3-1"
 PREFERRED_VERSION_olsrd ?= "0.5.3"
-- 
cgit v1.2.3


From 5e567478a22e4e0c25dcef25302f476e5d0fbb1b Mon Sep 17 00:00:00 2001
From: Junqian Gordon Xu <xjqian@gmail.com>
Date: Wed, 12 Dec 2007 07:21:07 +0000
Subject: octave: bump 2.9.19, fix -dbg += bug#2317

---
 packages/octave/octave_2.9.17.bb | 27 ---------------------------
 packages/octave/octave_2.9.19.bb | 27 +++++++++++++++++++++++++++
 2 files changed, 27 insertions(+), 27 deletions(-)
 delete mode 100644 packages/octave/octave_2.9.17.bb
 create mode 100644 packages/octave/octave_2.9.19.bb

diff --git a/packages/octave/octave_2.9.17.bb b/packages/octave/octave_2.9.17.bb
deleted file mode 100644
index 5473e0d99e..0000000000
--- a/packages/octave/octave_2.9.17.bb
+++ /dev/null
@@ -1,27 +0,0 @@
-require octave.inc
-
-SRC_URI = "ftp://ftp.octave.org/pub/octave/${PN}-${PV}.tar.gz \
-           file://configure.patch;patch=1"
-
-PR = "r0"
-
-PACKAGES =+ "libcruft liboctave liboctinterp octave-oct \
-	     libcruft-dev liboctave-dev liboctinterp-dev \
-             libcruft-dbg liboctave-dbg liboctinterp-dbg"
-
-FILES_libcruft = "${libdir}/${PN}-${PV}/libcruft*"
-FILES_libcruft-dev = "${libdir}/${PN}-${PV}/libcruft.so"
-FILES_libcruft-dbg = "${libdir}/${PN}-${PV}/.debug/libcruft*"
-
-FILES_liboctave = "${libdir}/${PN}-${PV}/liboctave*"
-FILES_liboctave-dev = "${libdir}/${PN}-${PV}/liboctave.so"
-FILES_liboctave-dbg = "${libdir}/${PN}-${PV}/.debug/liboctave*"
-
-FILES_liboctinterp = "${libdir}/${PN}-${PV}/liboctinterp*"
-FILES_liboctinterp-dev = "${libdir}/${PN}-${PV}/liboctinterp.so"
-FILES_liboctinterp-dbg = "${libdir}/${PN}-${PV}/.debug/liboctinterp*"
-
-# octave-oct provides subroutines in .oct file format
-FILES_${PN}-oct = "${libexecdir}/${PN}/${PV}/oct/${TARGET_SYS}/*.oct"
-
-FILES_${PN}-dbg += "${libexecdir}/${PN}/${PV}/oct/${TARGET_SYS}/.debug"
diff --git a/packages/octave/octave_2.9.19.bb b/packages/octave/octave_2.9.19.bb
new file mode 100644
index 0000000000..b92a181754
--- /dev/null
+++ b/packages/octave/octave_2.9.19.bb
@@ -0,0 +1,27 @@
+require octave.inc
+
+SRC_URI = "ftp://ftp.octave.org/pub/octave/${PN}-${PV}.tar.gz \
+           file://configure.patch;patch=1"
+
+PR = "r0"
+
+PACKAGES =+ "libcruft liboctave liboctinterp octave-oct \
+	     libcruft-dev liboctave-dev liboctinterp-dev \
+             libcruft-dbg liboctave-dbg liboctinterp-dbg"
+
+FILES_libcruft = "${libdir}/${PN}-${PV}/libcruft*"
+FILES_libcruft-dev = "${libdir}/${PN}-${PV}/libcruft.so"
+FILES_libcruft-dbg += "${libdir}/${PN}-${PV}/.debug/libcruft*"
+
+FILES_liboctave = "${libdir}/${PN}-${PV}/liboctave*"
+FILES_liboctave-dev = "${libdir}/${PN}-${PV}/liboctave.so"
+FILES_liboctave-dbg += "${libdir}/${PN}-${PV}/.debug/liboctave*"
+
+FILES_liboctinterp = "${libdir}/${PN}-${PV}/liboctinterp*"
+FILES_liboctinterp-dev = "${libdir}/${PN}-${PV}/liboctinterp.so"
+FILES_liboctinterp-dbg += "${libdir}/${PN}-${PV}/.debug/liboctinterp*"
+
+# octave-oct provides subroutines in .oct file format
+FILES_${PN}-oct = "${libexecdir}/${PN}/${PV}/oct/${TARGET_SYS}/*.oct"
+
+FILES_${PN}-dbg += "${libexecdir}/${PN}/${PV}/oct/${TARGET_SYS}/.debug"
-- 
cgit v1.2.3


From 49b8194c0aa1ab27a795cecac8954298fcfe6096 Mon Sep 17 00:00:00 2001
From: Junqian Gordon Xu <xjqian@gmail.com>
Date: Wed, 12 Dec 2007 07:32:26 +0000
Subject: zroadmap: move zroadmap recipies to packages/roadmap for merging

---
 packages/roadmap/zroadmap-1.0.12/.mtn2git_empty    |   0
 .../roadmap/zroadmap-1.0.12/qt2-fixes-r1.patch     |  36 ++++++++++++++
 packages/roadmap/zroadmap-1.0.12/qt2-fixes.patch   |  25 ++++++++++
 packages/roadmap/zroadmap-1.0.12/zroadgps.png      | Bin 0 -> 1949 bytes
 packages/roadmap/zroadmap_1.0.12.bb                |  53 ++++++++++++++++++++
 packages/roadmap/zroadmap_cvs.bb                   |  54 +++++++++++++++++++++
 packages/zroadmap/.mtn2git_empty                   |   0
 packages/zroadmap/files/.mtn2git_empty             |   0
 packages/zroadmap/files/qt2-fixes-r1.patch         |  36 --------------
 packages/zroadmap/files/qt2-fixes.patch            |  25 ----------
 packages/zroadmap/files/zroadgps.png               | Bin 1949 -> 0 bytes
 packages/zroadmap/zroadmap_1.0.12.bb               |  53 --------------------
 packages/zroadmap/zroadmap_cvs.bb                  |  54 ---------------------
 13 files changed, 168 insertions(+), 168 deletions(-)
 create mode 100644 packages/roadmap/zroadmap-1.0.12/.mtn2git_empty
 create mode 100644 packages/roadmap/zroadmap-1.0.12/qt2-fixes-r1.patch
 create mode 100644 packages/roadmap/zroadmap-1.0.12/qt2-fixes.patch
 create mode 100644 packages/roadmap/zroadmap-1.0.12/zroadgps.png
 create mode 100644 packages/roadmap/zroadmap_1.0.12.bb
 create mode 100644 packages/roadmap/zroadmap_cvs.bb
 delete mode 100644 packages/zroadmap/.mtn2git_empty
 delete mode 100644 packages/zroadmap/files/.mtn2git_empty
 delete mode 100644 packages/zroadmap/files/qt2-fixes-r1.patch
 delete mode 100644 packages/zroadmap/files/qt2-fixes.patch
 delete mode 100644 packages/zroadmap/files/zroadgps.png
 delete mode 100644 packages/zroadmap/zroadmap_1.0.12.bb
 delete mode 100644 packages/zroadmap/zroadmap_cvs.bb

diff --git a/packages/roadmap/zroadmap-1.0.12/.mtn2git_empty b/packages/roadmap/zroadmap-1.0.12/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/roadmap/zroadmap-1.0.12/qt2-fixes-r1.patch b/packages/roadmap/zroadmap-1.0.12/qt2-fixes-r1.patch
new file mode 100644
index 0000000000..24fe1c9bdb
--- /dev/null
+++ b/packages/roadmap/zroadmap-1.0.12/qt2-fixes-r1.patch
@@ -0,0 +1,36 @@
+
+#
+# Signed off by Michael 'Mickey' Lauer <mickey@Vanille.de>
+#
+
+--- src/qt/qt_main.cc~qt2-fixes-r1.patch
++++ src/qt/qt_main.cc
+@@ -137,7 +137,7 @@
+       switch (orientation[0]) {
+          case 't':
+          case 'T': break;
+-
++#ifndef QWS
+          case 'b':
+          case 'B': moveDockWindow (toolBar, DockBottom); break;
+ 
+@@ -146,7 +146,7 @@
+ 
+          case 'r':
+          case 'R': moveDockWindow (toolBar, DockRight); break;
+-
++#endif
+          default: roadmap_log (ROADMAP_FATAL,
+                         "Invalid toolbar orientation %s", orientation);
+       }
+--- src/qt/Makefile~qt2-fixes-r1.patch
++++ src/qt/Makefile
+@@ -19,7 +19,7 @@
+ 
+ ifeq ($(DESKTOP),QPE)
+    CFLAGS += -I$(QTDIR)/include -DQWS
+-   LIBS += -lqte -lqpe
++   LIBS += -lqpe
+    INSTALLDIR=$(QTDIR)
+ endif
+ 
diff --git a/packages/roadmap/zroadmap-1.0.12/qt2-fixes.patch b/packages/roadmap/zroadmap-1.0.12/qt2-fixes.patch
new file mode 100644
index 0000000000..46b17b8cfb
--- /dev/null
+++ b/packages/roadmap/zroadmap-1.0.12/qt2-fixes.patch
@@ -0,0 +1,25 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- roadmap-1.0.12/src/qt/qt_main.cc~qt2-fixes
++++ roadmap-1.0.12/src/qt/qt_main.cc
+@@ -123,7 +123,7 @@
+       switch (orientation[0]) {
+          case 't':
+          case 'T': break;
+-
++#ifndef QWS
+          case 'b':
+          case 'B': moveDockWindow (toolBar, DockBottom); break;
+ 
+@@ -132,7 +132,7 @@
+ 
+          case 'r':
+          case 'R': moveDockWindow (toolBar, DockRight); break;
+-
++#endif
+          default: roadmap_log (ROADMAP_FATAL,
+                         "Invalid toolbar orientation %s", orientation);
+       }
diff --git a/packages/roadmap/zroadmap-1.0.12/zroadgps.png b/packages/roadmap/zroadmap-1.0.12/zroadgps.png
new file mode 100644
index 0000000000..a77b3729b7
Binary files /dev/null and b/packages/roadmap/zroadmap-1.0.12/zroadgps.png differ
diff --git a/packages/roadmap/zroadmap_1.0.12.bb b/packages/roadmap/zroadmap_1.0.12.bb
new file mode 100644
index 0000000000..5b9161cfce
--- /dev/null
+++ b/packages/roadmap/zroadmap_1.0.12.bb
@@ -0,0 +1,53 @@
+DESCRIPTION = "RoadMap is a program that provides a car navigation for Linux and UNIX. \
+It displays a map of the streets, tracks the position provided by a NMEA-compliant \
+GPS receiver, identifies the street matching this GPS position and announces the name \
+of the crossing street at the next intersection. A rudimentary trip feature allows \
+RoadMap to display some basic navigation information (distance to the destination, \
+direction, speed, etc..). Voice messages are generated that duplicate some of the screen information."
+SECTION = "opie/applications"
+PRIORITY = "optional"
+AUTHOR = "Pascal Martin <pascal.martin@iname.com>"
+HOMEPAGE = "http://roadmap.digitalomaha.net/maps.html"
+LICENSE = "GPL"
+PR = "r0"
+
+SRC_URI = "http://www.roadmap.digitalomaha.net/roadmap/roadmap_1_0_12p2_src.tar.gz \
+           file://qt2-fixes.patch;pnum=2;patch=1 \
+           http://roadmap.digitalomaha.net/maps/usdir.rdm.tgz \
+           file://zroadgps.png"
+S = "${WORKDIR}/roadmap-${PV}/src"
+
+inherit palmtop
+
+QT_LIBRARY = '${@base_conditional("PALMTOP_USE_MULTITHREADED_QT", "yes", "qte-mt", "qte",d)}'
+QT_LIBRARY_append_c7x0 = " -laticore"
+
+EXTRA_OEMAKE = 'DESKTOP=QPE MOC=${OE_QMAKE_MOC} UIC=${OE_QMAKE_UIC} \
+                GUICFLAGS="-I${OE_QMAKE_INCDIR_QT} -I${S} -DQWS" \
+                GUILDFLAGS="-lz -lpng -ljpeg -lts -l${QT_LIBRARY} -lqpe -Wl,-rpath-link,${STAGING_LIBDIR} -L${STAGING_LIBDIR} -L${QTDIR}/lib"'
+PARALLEL_MAKE = ""
+
+do_configure() {
+	echo removing pregenerated stuff
+	find . -name "moc*"|xargs rm -f
+}
+
+do_compile() {
+	oe_runmake libguiroadmap.a libguiroadgps.a libroadmap.a unix/libosroadmap.a
+	cd qt && oe_runmake
+}
+
+do_install() {
+	cd qt
+        install -d ${D}${palmtopdir}/bin
+	install -d ${D}${palmtopdir}/apps/Applications
+	install -d ${D}${palmtopdir}/pics
+        install -m 0755 qtroadmap ${D}${palmtopdir}/bin/roadmap
+	install -m 0755 qtroadgps ${D}${palmtopdir}/bin/roadgps
+	install -m 0644 ../roadmap.png ${D}${palmtopdir}/pics/zroadmap.png
+	install -m 0644 ${WORKDIR}/zroadgps.png ${D}${palmtopdir}/pics/zroadgps.png
+        install -m 0644 ipkg/*.desktop ${D}${palmtopdir}/apps/Applications/
+	install -d ${D}${palmtopdir}/share/roadmap/
+        install -m 0644 ../sprites ../schema ../preferences ${D}${palmtopdir}/share/roadmap/
+	install -m 0644 ${WORKDIR}/usdir.rdm ${D}${palmtopdir}/share/roadmap/
+}
diff --git a/packages/roadmap/zroadmap_cvs.bb b/packages/roadmap/zroadmap_cvs.bb
new file mode 100644
index 0000000000..fd9cc5e95f
--- /dev/null
+++ b/packages/roadmap/zroadmap_cvs.bb
@@ -0,0 +1,54 @@
+DESCRIPTION = "RoadMap is a program that provides a car navigation for Linux and UNIX. \
+It displays a map of the streets, tracks the position provided by a NMEA-compliant \
+GPS receiver, identifies the street matching this GPS position and announces the name \
+of the crossing street at the next intersection."
+SECTION = "opie/applications"
+PRIORITY = "optional"
+AUTHOR = "Pascal Martin <pascal.martin@iname.com>"
+HOMEPAGE = "http://roadmap.digitalomaha.net/maps.html"
+DEPENDS = "popt expat"
+LICENSE = "GPL"
+PV = "1.0.12+cvs-${SRCDATE}"
+PR = "r0"
+
+SRC_URI = "cvs://anonymous:@roadmap.cvs.sf.net/cvsroot/roadmap;module=roadmap \
+           file://qt2-fixes-r1.patch;pnum=1;patch=1 \
+           http://roadmap.digitalomaha.net/maps/usdir.rdm.tgz \
+           file://zroadgps.png"
+S = "${WORKDIR}/roadmap/src"
+
+inherit palmtop
+
+QT_LIBRARY = '${@base_conditional("PALMTOP_USE_MULTITHREADED_QT", "yes", "qte-mt", "qte",d)}'
+QT_LIBRARY_append_c7x0 = " -laticore"
+
+EXTRA_OEMAKE = 'DESKTOP=QPE MOC=${OE_QMAKE_MOC} UIC=${OE_QMAKE_UIC} QTDIR=${QTDIR} \
+                CFLAGS="-DQWS -DQT_NO_ROTATE -I${S} ${OE_QMAKE_CXXFLAGS} -I${OE_QMAKE_INCDIR_QT}" \
+                LDFLAGS="${OE_QMAKE_LDFLAGS} -L${OE_QMAKE_LIBDIR_QT} -Wl,-rpath-link,${OE_QMAKE_LIBDIR_QT}" '
+PARALLEL_MAKE = ""
+
+do_configure() {
+	echo removing pregenerated stuff
+	find . -name "moc*"|xargs rm -f
+}
+
+do_compile() {
+	oe_runmake libguiroadmap.a libguiroadgps.a libroadmap.a
+	oe_runmake -C gpx libgpx.a
+	oe_runmake -C unix libosroadmap.a
+	oe_runmake -C qt qtroadmap qtroadgps
+}
+
+do_install() {
+        install -d ${D}${palmtopdir}/bin
+	install -d ${D}${palmtopdir}/apps/Applications
+	install -d ${D}${palmtopdir}/pics
+        install -m 0755 qt/qtroadmap ${D}${palmtopdir}/bin/roadmap
+	install -m 0755 qt/qtroadgps ${D}${palmtopdir}/bin/roadgps
+	install -m 0644 roadmap.png ${D}${palmtopdir}/pics/zroadmap.png
+	install -m 0644 ${WORKDIR}/zroadgps.png ${D}${palmtopdir}/pics/zroadgps.png
+        install -m 0644 qt/ipkg/*.desktop ${D}${palmtopdir}/apps/Applications/
+	install -d ${D}${palmtopdir}/share/roadmap/
+        install -m 0644 sprites schema preferences ${D}${palmtopdir}/share/roadmap/
+	install -m 0644 ${WORKDIR}/usdir.rdm ${D}${palmtopdir}/share/roadmap/
+}
diff --git a/packages/zroadmap/.mtn2git_empty b/packages/zroadmap/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/packages/zroadmap/files/.mtn2git_empty b/packages/zroadmap/files/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/packages/zroadmap/files/qt2-fixes-r1.patch b/packages/zroadmap/files/qt2-fixes-r1.patch
deleted file mode 100644
index 24fe1c9bdb..0000000000
--- a/packages/zroadmap/files/qt2-fixes-r1.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-
-#
-# Signed off by Michael 'Mickey' Lauer <mickey@Vanille.de>
-#
-
---- src/qt/qt_main.cc~qt2-fixes-r1.patch
-+++ src/qt/qt_main.cc
-@@ -137,7 +137,7 @@
-       switch (orientation[0]) {
-          case 't':
-          case 'T': break;
--
-+#ifndef QWS
-          case 'b':
-          case 'B': moveDockWindow (toolBar, DockBottom); break;
- 
-@@ -146,7 +146,7 @@
- 
-          case 'r':
-          case 'R': moveDockWindow (toolBar, DockRight); break;
--
-+#endif
-          default: roadmap_log (ROADMAP_FATAL,
-                         "Invalid toolbar orientation %s", orientation);
-       }
---- src/qt/Makefile~qt2-fixes-r1.patch
-+++ src/qt/Makefile
-@@ -19,7 +19,7 @@
- 
- ifeq ($(DESKTOP),QPE)
-    CFLAGS += -I$(QTDIR)/include -DQWS
--   LIBS += -lqte -lqpe
-+   LIBS += -lqpe
-    INSTALLDIR=$(QTDIR)
- endif
- 
diff --git a/packages/zroadmap/files/qt2-fixes.patch b/packages/zroadmap/files/qt2-fixes.patch
deleted file mode 100644
index 46b17b8cfb..0000000000
--- a/packages/zroadmap/files/qt2-fixes.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- roadmap-1.0.12/src/qt/qt_main.cc~qt2-fixes
-+++ roadmap-1.0.12/src/qt/qt_main.cc
-@@ -123,7 +123,7 @@
-       switch (orientation[0]) {
-          case 't':
-          case 'T': break;
--
-+#ifndef QWS
-          case 'b':
-          case 'B': moveDockWindow (toolBar, DockBottom); break;
- 
-@@ -132,7 +132,7 @@
- 
-          case 'r':
-          case 'R': moveDockWindow (toolBar, DockRight); break;
--
-+#endif
-          default: roadmap_log (ROADMAP_FATAL,
-                         "Invalid toolbar orientation %s", orientation);
-       }
diff --git a/packages/zroadmap/files/zroadgps.png b/packages/zroadmap/files/zroadgps.png
deleted file mode 100644
index a77b3729b7..0000000000
Binary files a/packages/zroadmap/files/zroadgps.png and /dev/null differ
diff --git a/packages/zroadmap/zroadmap_1.0.12.bb b/packages/zroadmap/zroadmap_1.0.12.bb
deleted file mode 100644
index 5b9161cfce..0000000000
--- a/packages/zroadmap/zroadmap_1.0.12.bb
+++ /dev/null
@@ -1,53 +0,0 @@
-DESCRIPTION = "RoadMap is a program that provides a car navigation for Linux and UNIX. \
-It displays a map of the streets, tracks the position provided by a NMEA-compliant \
-GPS receiver, identifies the street matching this GPS position and announces the name \
-of the crossing street at the next intersection. A rudimentary trip feature allows \
-RoadMap to display some basic navigation information (distance to the destination, \
-direction, speed, etc..). Voice messages are generated that duplicate some of the screen information."
-SECTION = "opie/applications"
-PRIORITY = "optional"
-AUTHOR = "Pascal Martin <pascal.martin@iname.com>"
-HOMEPAGE = "http://roadmap.digitalomaha.net/maps.html"
-LICENSE = "GPL"
-PR = "r0"
-
-SRC_URI = "http://www.roadmap.digitalomaha.net/roadmap/roadmap_1_0_12p2_src.tar.gz \
-           file://qt2-fixes.patch;pnum=2;patch=1 \
-           http://roadmap.digitalomaha.net/maps/usdir.rdm.tgz \
-           file://zroadgps.png"
-S = "${WORKDIR}/roadmap-${PV}/src"
-
-inherit palmtop
-
-QT_LIBRARY = '${@base_conditional("PALMTOP_USE_MULTITHREADED_QT", "yes", "qte-mt", "qte",d)}'
-QT_LIBRARY_append_c7x0 = " -laticore"
-
-EXTRA_OEMAKE = 'DESKTOP=QPE MOC=${OE_QMAKE_MOC} UIC=${OE_QMAKE_UIC} \
-                GUICFLAGS="-I${OE_QMAKE_INCDIR_QT} -I${S} -DQWS" \
-                GUILDFLAGS="-lz -lpng -ljpeg -lts -l${QT_LIBRARY} -lqpe -Wl,-rpath-link,${STAGING_LIBDIR} -L${STAGING_LIBDIR} -L${QTDIR}/lib"'
-PARALLEL_MAKE = ""
-
-do_configure() {
-	echo removing pregenerated stuff
-	find . -name "moc*"|xargs rm -f
-}
-
-do_compile() {
-	oe_runmake libguiroadmap.a libguiroadgps.a libroadmap.a unix/libosroadmap.a
-	cd qt && oe_runmake
-}
-
-do_install() {
-	cd qt
-        install -d ${D}${palmtopdir}/bin
-	install -d ${D}${palmtopdir}/apps/Applications
-	install -d ${D}${palmtopdir}/pics
-        install -m 0755 qtroadmap ${D}${palmtopdir}/bin/roadmap
-	install -m 0755 qtroadgps ${D}${palmtopdir}/bin/roadgps
-	install -m 0644 ../roadmap.png ${D}${palmtopdir}/pics/zroadmap.png
-	install -m 0644 ${WORKDIR}/zroadgps.png ${D}${palmtopdir}/pics/zroadgps.png
-        install -m 0644 ipkg/*.desktop ${D}${palmtopdir}/apps/Applications/
-	install -d ${D}${palmtopdir}/share/roadmap/
-        install -m 0644 ../sprites ../schema ../preferences ${D}${palmtopdir}/share/roadmap/
-	install -m 0644 ${WORKDIR}/usdir.rdm ${D}${palmtopdir}/share/roadmap/
-}
diff --git a/packages/zroadmap/zroadmap_cvs.bb b/packages/zroadmap/zroadmap_cvs.bb
deleted file mode 100644
index fd9cc5e95f..0000000000
--- a/packages/zroadmap/zroadmap_cvs.bb
+++ /dev/null
@@ -1,54 +0,0 @@
-DESCRIPTION = "RoadMap is a program that provides a car navigation for Linux and UNIX. \
-It displays a map of the streets, tracks the position provided by a NMEA-compliant \
-GPS receiver, identifies the street matching this GPS position and announces the name \
-of the crossing street at the next intersection."
-SECTION = "opie/applications"
-PRIORITY = "optional"
-AUTHOR = "Pascal Martin <pascal.martin@iname.com>"
-HOMEPAGE = "http://roadmap.digitalomaha.net/maps.html"
-DEPENDS = "popt expat"
-LICENSE = "GPL"
-PV = "1.0.12+cvs-${SRCDATE}"
-PR = "r0"
-
-SRC_URI = "cvs://anonymous:@roadmap.cvs.sf.net/cvsroot/roadmap;module=roadmap \
-           file://qt2-fixes-r1.patch;pnum=1;patch=1 \
-           http://roadmap.digitalomaha.net/maps/usdir.rdm.tgz \
-           file://zroadgps.png"
-S = "${WORKDIR}/roadmap/src"
-
-inherit palmtop
-
-QT_LIBRARY = '${@base_conditional("PALMTOP_USE_MULTITHREADED_QT", "yes", "qte-mt", "qte",d)}'
-QT_LIBRARY_append_c7x0 = " -laticore"
-
-EXTRA_OEMAKE = 'DESKTOP=QPE MOC=${OE_QMAKE_MOC} UIC=${OE_QMAKE_UIC} QTDIR=${QTDIR} \
-                CFLAGS="-DQWS -DQT_NO_ROTATE -I${S} ${OE_QMAKE_CXXFLAGS} -I${OE_QMAKE_INCDIR_QT}" \
-                LDFLAGS="${OE_QMAKE_LDFLAGS} -L