Merge branch 'holger/openmoko-merges' into org.openembedded.dev

Conflicts:

	packages/tasks/task-openmoko-feed.bb

72 files changed, 321 insertions, 127 deletions

diff --git a/packages/gnash/gnash-minimal.inc b/packages/gnash/gnash-minimal.inc
index 4f52322467..a8e5229f46 100644
--- a/packages/gnash/gnash-minimal.inc
+++ b/packages/gnash/gnash-minimal.inc
@@ -2,8 +2,8 @@ DESCRIPTION = "Gnash is a GNU Flash movie player that supports many SWF v7 featu
 HOMEPAGE = "http://www.gnu.org/software/gnash"
 LICENSE = "GPL-2"
 
-DEPENDS = "virtual/libiconv virtual/libintl ffmpeg libtool agg libxml2 zlib boost jpeg pango curl freetype \
-           ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad', d)}"
+DEPENDS = "virtual/libiconv virtual/libintl libtool agg libxml2 zlib boost jpeg pango curl freetype \
+           ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'ffmpeg libmad', d)}"
 RRECOMMENDS_${PN} = "libltdl"
 
 SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gnash/${PV}/gnash-${PV}.tar.bz2"
@@ -28,8 +28,9 @@ EXTRA_OECONF="--enable-gui=gtk \
                 --disable-glext \
                 --disable-Xft \
                 --disable-expat \
-                --enable-mad \
+                ${@base_conditional('ENTERPRISE_DISTRO', '1', '', '--enable-mad', d)} \
                 --disable-gstreamer \
+                ${@base_conditional('ENTERPRISE_DISTRO', '1', '', '--enable-media=ffmpeg', d)} \
                 --enable-media=ffmpeg \
                 --disable-plugin \
                 --disable-cygnal \
diff --git a/packages/gnash/gnash-minimal_0.8.2.bb b/packages/gnash/gnash-minimal_0.8.2.bb
index ea99de1e39..81a97e3b7d 100644
--- a/packages/gnash/gnash-minimal_0.8.2.bb
+++ b/packages/gnash/gnash-minimal_0.8.2.bb
@@ -1,3 +1,3 @@
 require gnash-minimal.inc
 
-PR = "r3"
+PR = "r4"
diff --git a/packages/gnash/gnash-minimal_0.8.3.bb b/packages/gnash/gnash-minimal_0.8.3.bb
index 237097b94a..6f78d94c10 100644
--- a/packages/gnash/gnash-minimal_0.8.3.bb
+++ b/packages/gnash/gnash-minimal_0.8.3.bb
@@ -1,6 +1,6 @@
 require gnash-minimal.inc
 
-PR = "r8"
+PR = "r9"
 
 EXTRA_OECONF += " --without-included-ltdl \
                   --with-ltdl-include=${STAGING_INCDIR} \
diff --git a/packages/gnash/gnash-minimal_cvs.bb b/packages/gnash/gnash-minimal_cvs.bb
index 7c36dbafff..e1eff37b88 100644
--- a/packages/gnash/gnash-minimal_cvs.bb
+++ b/packages/gnash/gnash-minimal_cvs.bb
@@ -1,7 +1,7 @@
 require gnash-minimal.inc
 
 
-PR = "r3"
+PR = "r4"
 
 PV = "0.8.3+cvs${SRCDATE}"
 
diff --git a/packages/gnash/gnash.inc b/packages/gnash/gnash.inc
index 59261e3121..f4c7c1338d 100644
--- a/packages/gnash/gnash.inc
+++ b/packages/gnash/gnash.inc
@@ -1,10 +1,10 @@
 DESCRIPTION = "Gnash is a GNU Flash movie player that supports many SWF v7 features"
 HOMEPAGE = "http://www.gnu.org/software/gnash"
 LICENSE = "GPL-2"
-DEPENDS = "libtool ffmpeg gtk+ cairo libxml2 libsdl-mixer zlib boost jpeg pango curl freetype \
-           ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad', d)}"
+DEPENDS = "libtool gtk+ cairo libxml2 libsdl-mixer zlib boost jpeg pango curl freetype \
+           ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'ffmpeg libmad', d)}"
           
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gnash/${PV}/gnash-${PV}.tar.bz2 \
           "
@@ -13,14 +13,14 @@ inherit autotools pkgconfig
 
 EXTRA_OECONF = "--enable-gui=gtk \
                 --enable-renderer=cairo \
-                --enable-media=ffmpeg \
+                ${@base_conditional('ENTERPRISE_DISTRO', '1', '', '--enable-media=ffmpeg', d)} \
                 --disable-klash \
                 --enable-z \
                 --enable-jpeg \
                 --disable-glext \
                 --enable-Xft \
                 --enable-expat \
-                --enable-mad \
+                ${@base_conditional('ENTERPRISE_DISTRO', '1', '', '--enable-mad', d)} \
                 --enable-cairo \
                 --enable-plugin \
                 --disable-cygnal \
diff --git a/packages/gnash/gnash_0.8.0.bb b/packages/gnash/gnash_0.8.0.bb
index d9dc87a417..e809525606 100644
--- a/packages/gnash/gnash_0.8.0.bb
+++ b/packages/gnash/gnash_0.8.0.bb
@@ -1,3 +1,3 @@
 require gnash.inc
 
-PR = "r1"
+PR = "r2"
diff --git a/packages/gnash/gnash_0.8.1.bb b/packages/gnash/gnash_0.8.1.bb
index d9dc87a417..e809525606 100644
--- a/packages/gnash/gnash_0.8.1.bb
+++ b/packages/gnash/gnash_0.8.1.bb
@@ -1,3 +1,3 @@
 require gnash.inc
 
-PR = "r1"
+PR = "r2"
diff --git a/packages/gnash/gnash_0.8.2.bb b/packages/gnash/gnash_0.8.2.bb
index d9dc87a417..e809525606 100644
--- a/packages/gnash/gnash_0.8.2.bb
+++ b/packages/gnash/gnash_0.8.2.bb
@@ -1,3 +1,3 @@
 require gnash.inc
 
-PR = "r1"
+PR = "r2"
diff --git a/packages/gnash/gnash_0.8.3.bb b/packages/gnash/gnash_0.8.3.bb
index 9afde70d98..1b36f30af0 100644
--- a/packages/gnash/gnash_0.8.3.bb
+++ b/packages/gnash/gnash_0.8.3.bb
@@ -1,6 +1,6 @@
 require gnash.inc
 
-PR = "r4"
+PR = "r5"
 
 EXTRA_OECONF += " --without-included-ltdl \
                   --with-ltdl-include=${STAGING_INCDIR} \
diff --git a/packages/gsm/files/0001-Introduce-ports.patch b/packages/gsm/files/0001-Introduce-ports.patch
index b3ba3cb957..ce96ba5c92 100644
--- a/packages/gsm/files/0001-Introduce-ports.patch
+++ b/packages/gsm/files/0001-Introduce-ports.patch
@@ -505,7 +505,7 @@ index 0000000..22a4a5c
 @@ -0,0 +1,202 @@
 +/* Wrapper for the physical UART in a struct gsmd_port abstraction.
 + *
-+ * Copyright (C) 2007 OpenMoko, Inc.
++ * Copyright (C) 2007 Openmoko, Inc.
 + * Written by Andrzej Zaborowski <andrew@openedhand.com>
 + *
 + * This program is free software; you can redistribute it and/or
diff --git a/packages/images/openmoko-asu-image.bb b/packages/images/openmoko-asu-image.bb
index 2a8896c592..e7307c73d0 100644
--- a/packages/images/openmoko-asu-image.bb
+++ b/packages/images/openmoko-asu-image.bb
@@ -4,4 +4,7 @@
 
 require openmoko-minimal-image.bb
 
-IMAGE_INSTALL += "task-openmoko-asu"
+IMAGE_INSTALL += "\
+                  task-openmoko-asu \
+                  task-openmoko-basic \
+                  "
diff --git a/packages/images/openmoko-base-image.bb b/packages/images/openmoko-base-image.bb
new file mode 100644
index 0000000000..8acb0f5f90
--- /dev/null
+++ b/packages/images/openmoko-base-image.bb
@@ -0,0 +1,7 @@
+#------------------------------------------------------
+# Openmoko Base Image Recipe
+#------------------------------------------------------
+
+require openmoko-minimal-image.bb
+
+IMAGE_INSTALL += "task-openmoko-basic"
diff --git a/packages/libmrss/files/better-parse-url-r0.patch b/packages/libmrss/files/better-parse-url-r0.patch
index b365819008..5909eee173 100644
--- a/packages/libmrss/files/better-parse-url-r0.patch
+++ b/packages/libmrss/files/better-parse-url-r0.patch
@@ -2,7 +2,7 @@ upstream: mailed to bakunin_at_autistici_dot_org by Laibsch
 status: committed in upstream CVS on Feb 26th 2008
 comment: API addition to not manually setup the CURL connection and still
 be able to get the transfered feed and save it to secondary storage. done
-by zecke for the OpenMoko RSS reader.
+by zecke for the Openmoko RSS reader.
 
 
 Index: libmrss-0.17.2/src/mrss.h
diff --git a/packages/mokoko/mokoko_svn.bb b/packages/mokoko/mokoko_svn.bb
new file mode 100644
index 0000000000..081c53ca88
--- /dev/null
+++ b/packages/mokoko/mokoko_svn.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "Mokoko - a simple media player"
+HOMEPAGE = "http://code.google.com/p/om-mediaplayer/"
+SECTION = "openmoko/applications"
+LICENSE = "GPL"
+DEPENDS = "gstreamer"
+RDEPENDS = "gstreamer"
+
+PV = "0.1+svnr${SRCPV}"
+PR = "r0"
+
+SRC_URI = "svn://om-mediaplayer.googlecode.com/svn/;module=trunk;proto=http"
+
+S = "${WORKDIR}/trunk/mokoko"
+
+inherit autotools
+
diff --git a/packages/mplayer/mplayer_0.0+1.0rc2.bb b/packages/mplayer/mplayer_0.0+1.0rc2.bb
index 9d32fce12f..481acce475 100644
--- a/packages/mplayer/mplayer_0.0+1.0rc2.bb
+++ b/packages/mplayer/mplayer_0.0+1.0rc2.bb
@@ -45,7 +45,7 @@ ARM_INSTRUCTION_SET = "ARM"
 RCONFLICTS_${PN} = "mplayer-atty"
 RREPLACES_${PN} = "mplayer-atty"
 
-PR = "r10"
+PR = "r12"
 
 PARALLEL_MAKE = ""
 
@@ -121,12 +121,12 @@ EXTRA_OECONF = " \
         --disable-faac \
         --disable-ladspa \
         --disable-libdv \
-        --enable-mad \
+        ${@base_conditional('ENTERPRISE_DISTRO', '1', '--disable-mad', '--enable-mad', d)} \
         --disable-toolame \
         --disable-twolame \
         --disable-xmms \
 	--disable-mp3lib \
-        --enable-libmpeg2 \
+        ${@base_conditional('ENTERPRISE_DISTRO', '1', '--disable-libmpeg2', '--enable-libmpeg2', d)} \
         --disable-musepack \
 	\
         --disable-gl \
diff --git a/packages/openmoko-projects/assassin-thumbnail.bb b/packages/openmoko-projects/assassin-thumbnail.bb
index ece6662b91..b05c65dc1d 100644
--- a/packages/openmoko-projects/assassin-thumbnail.bb
+++ b/packages/openmoko-projects/assassin-thumbnail.bb
@@ -1,10 +1,9 @@
 DESCRIPTION = "Assassin Packages Thumbnails"
 HOMEPAGE = "http://assassin.projects.openmoko.org/"
-PKG_TAGS_${PN} = "group::unknown"
 LICENSE = "GPL"
 RDEPENDS = "assassin"
-PV = "0.1+svnr${SRCPV}"
-PR = "r0"
+PV = "0.1+svnr${SRCREV}"
+PR = "r1"
 
 SRC_URI = "svn://svn.openmoko.org/trunk/src/target/thumbnails/;module=result;proto=https"
 
diff --git a/packages/openmoko-projects/diversity-radar_svn.bb b/packages/openmoko-projects/diversity-radar_svn.bb
index d7163f1f21..7a98d93afb 100644
--- a/packages/openmoko-projects/diversity-radar_svn.bb
+++ b/packages/openmoko-projects/diversity-radar_svn.bb
@@ -15,4 +15,4 @@ inherit setuptools
 
 FILES_${PN} += "${prefix}/share/*"
 
-PKG_TAGS_${PN} = "group::communication"
+PKG_TAGS_${PN} = "group::communication alias::Diversity_Radar"
diff --git a/packages/openmoko-projects/om-locations_git.bb b/packages/openmoko-projects/om-locations_git.bb
index a25a3e21ba..9207502f2f 100644
--- a/packages/openmoko-projects/om-locations_git.bb
+++ b/packages/openmoko-projects/om-locations_git.bb
@@ -19,4 +19,4 @@ do_configure_prepend() {
        autopoint --force
 }
 
-PKG_TAGS_${PN} = "group::communication"
+PKG_TAGS_${PN} = "group::communication alias::Om_Locations"
diff --git a/packages/openmoko-projects/om-maps-berlin_20080430.bb b/packages/openmoko-projects/om-maps-berlin_20080430.bb
index aaf6e5332c..17bfe725fc 100644
--- a/packages/openmoko-projects/om-maps-berlin_20080430.bb
+++ b/packages/openmoko-projects/om-maps-berlin_20080430.bb
@@ -1,7 +1,7 @@
-PR = "r1"
+PR = "r2"
 
+MAP_NAME = "Berlin"
 require om-maps.inc
 
-MAP_NAME = "Berlin"
 MAP_FN = "om-maps-berlin-${PV}.eet"
 MAP_VER = "${PV}"
diff --git a/packages/openmoko-projects/om-maps-buenos-aires_20080430.bb b/packages/openmoko-projects/om-maps-buenos-aires_20080430.bb
index 81f734f27a..8f2f2a205d 100644
--- a/packages/openmoko-projects/om-maps-buenos-aires_20080430.bb
+++ b/packages/openmoko-projects/om-maps-buenos-aires_20080430.bb
@@ -1,7 +1,7 @@
-PR = "r1"
+PR = "r2"
 
+MAP_NAME = "Buenos Aires"
 require om-maps.inc
 
-MAP_NAME = "Buenos Aires"
 MAP_FN = "om-maps-buenos-aires-${PV}.eet"
 MAP_VER = "${PV}"
diff --git a/packages/openmoko-projects/om-maps-hong-kong_20080919.bb b/packages/openmoko-projects/om-maps-hong-kong_20080919.bb
index 9aecf64816..9b641778ec 100644
--- a/packages/openmoko-projects/om-maps-hong-kong_20080919.bb
+++ b/packages/openmoko-projects/om-maps-hong-kong_20080919.bb
@@ -1,7 +1,7 @@
 PR = "r1"
 
+MAP_NAME = "Hong Kong"
 require om-maps.inc
 
-MAP_NAME = "Hong Kong"
 MAP_FN = "om-maps-hong-kong-${PV}.eet"
 MAP_VER = "${PV}"
diff --git a/packages/openmoko-projects/om-maps-london_20080430.bb b/packages/openmoko-projects/om-maps-london_20080430.bb
index d07add5032..f19b956f00 100644
--- a/packages/openmoko-projects/om-maps-london_20080430.bb
+++ b/packages/openmoko-projects/om-maps-london_20080430.bb
@@ -1,7 +1,7 @@
-PR = "r1"
+PR = "r2"
 
+MAP_NAME = "London"
 require om-maps.inc
 
-MAP_NAME = "London"
 MAP_FN = "om-maps-london-${PV}.eet"
 MAP_VER = "${PV}"
diff --git a/packages/openmoko-projects/om-maps-low-levels_20080430.bb b/packages/openmoko-projects/om-maps-low-levels_20080430.bb
index 7f94c903b5..24c57b6f21 100644
--- a/packages/openmoko-projects/om-maps-low-levels_20080430.bb
+++ b/packages/openmoko-projects/om-maps-low-levels_20080430.bb
@@ -1,7 +1,9 @@
-PR = "r0"
+PR = "r1"
 
+MAP_NAME = "low levels"
 require om-maps.inc
 
-MAP_NAME = "low levels"
+
+PKG_TAGS_${PN} = "alias::${ALIAS_NAME_${PN}}"
 MAP_FN = "om-maps-low-levels-${PV}.eet"
 MAP_VER = "${PV}"
diff --git a/packages/openmoko-projects/om-maps-new-york_20080430.bb b/packages/openmoko-projects/om-maps-new-york_20080430.bb
index 2fffda62c3..52a40cccc6 100644
--- a/packages/openmoko-projects/om-maps-new-york_20080430.bb
+++ b/packages/openmoko-projects/om-maps-new-york_20080430.bb
@@ -1,7 +1,7 @@
-PR = "r1"
+PR = "r2"
 
+MAP_NAME = "New York"
 require om-maps.inc
 
-MAP_NAME = "New York"
 MAP_FN = "om-maps-new-york-${PV}.eet"
 MAP_VER = "${PV}"
diff --git a/packages/openmoko-projects/om-maps-paris_20080430.bb b/packages/openmoko-projects/om-maps-paris_20080430.bb
index 663656a673..3c66830cdb 100644
--- a/packages/openmoko-projects/om-maps-paris_20080430.bb
+++ b/packages/openmoko-projects/om-maps-paris_20080430.bb
@@ -1,7 +1,7 @@
-PR = "r1"
+PR = "r2"
 
+MAP_NAME = "Paris"
 require om-maps.inc
 
-MAP_NAME = "Paris"
 MAP_FN = "om-maps-paris-${PV}.eet"
 MAP_VER = "${PV}"
diff --git a/packages/openmoko-projects/om-maps-providence_20080430.bb b/packages/openmoko-projects/om-maps-providence_20080430.bb
index 919e030e17..5fd447b663 100644
--- a/packages/openmoko-projects/om-maps-providence_20080430.bb
+++ b/packages/openmoko-projects/om-maps-providence_20080430.bb
@@ -1,7 +1,7 @@
-PR = "r1"
+PR = "r2"
 
+MAP_NAME = "Providence"
 require om-maps.inc
 
-MAP_NAME = "Providence"
 MAP_FN = "om-maps-providence-${PV}.eet"
 MAP_VER = "${PV}"
diff --git a/packages/openmoko-projects/om-maps-san-francisco_20080430.bb b/packages/openmoko-projects/om-maps-san-francisco_20080430.bb
index 6b5f77981a..b4fb9d00e6 100644
--- a/packages/openmoko-projects/om-maps-san-francisco_20080430.bb
+++ b/packages/openmoko-projects/om-maps-san-francisco_20080430.bb
@@ -1,7 +1,7 @@
-PR = "r1"
+PR = "r2"
 
+MAP_NAME = "San Francisco"
 require om-maps.inc
 
-MAP_NAME = "San Francisco"
 MAP_FN = "om-maps-san-francisco-${PV}.eet"
 MAP_VER = "${PV}"
diff --git a/packages/openmoko-projects/om-maps-sydney_20080430.bb b/packages/openmoko-projects/om-maps-sydney_20080430.bb
index 267b6a1724..81e379c373 100644
--- a/packages/openmoko-projects/om-maps-sydney_20080430.bb
+++ b/packages/openmoko-projects/om-maps-sydney_20080430.bb
@@ -1,7 +1,7 @@
-PR = "r1"
+PR = "r2"
 
+MAP_NAME = "Sydney"
 require om-maps.inc
 
-MAP_NAME = "Sydney"
 MAP_FN = "om-maps-sydney-${PV}.eet"
 MAP_VER = "${PV}"
diff --git a/packages/openmoko-projects/om-maps-taipei_20080430.bb b/packages/openmoko-projects/om-maps-taipei_20080430.bb
index bb017f59fb..fdd5c36f02 100644
--- a/packages/openmoko-projects/om-maps-taipei_20080430.bb
+++ b/packages/openmoko-projects/om-maps-taipei_20080430.bb
@@ -1,7 +1,7 @@
-PR = "r1"
+PR = "r2"
 
+MAP_NAME = "Taipei"
 require om-maps.inc
 
-MAP_NAME = "Taipei"
 MAP_FN = "om-maps-taipei-${PV}.eet"
 MAP_VER = "${PV}"
diff --git a/packages/openmoko-projects/om-maps.inc b/packages/openmoko-projects/om-maps.inc
index f2ef1dbbec..36081bdcca 100644
--- a/packages/openmoko-projects/om-maps.inc
+++ b/packages/openmoko-projects/om-maps.inc
@@ -11,7 +11,8 @@ FILES_${PN} = "${MAP_DIR}/${MAP_FN}"
 
 PACKAGES = "${PN}"
 PACKAGE_ARCH = "all"
-PKG_TAGS_${PN} = "group::maps"
+ALIAS_NAME_${PN}= "${@bb.data.getVar('MAP_NAME', d, 1).replace(' ','_')}"
+PKG_TAGS_${PN} = "group::maps alias::${ALIAS_NAME_${PN}}"
 
 do_install() {
         install -d ${D}${MAP_DIR}
diff --git a/packages/openmoko-projects/openmoko-community-repository.bb b/packages/openmoko-projects/openmoko-community-repository.bb
index d866558fb3..45507233c0 100644
--- a/packages/openmoko-projects/openmoko-community-repository.bb
+++ b/packages/openmoko-projects/openmoko-community-repository.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Configuration files for online package repositories of Openmoko community repository feeds"
-PR = "r0.02"
+PR = "r0.03"
 
 do_compile() {
     mkdir -p ${S}/${sysconfdir}/opkg
@@ -16,6 +16,6 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 CONFFILES_${PN} += "${sysconfdir}/opkg/Multiverse-feed.conf"
 
-PKG_TAGS_${PN} = "group::repos"
+PKG_TAGS_${PN} = "group::repos alias::Om_Multiverse"
 
 OPENMOKO_URI = "http://downloads.openmoko.org/repository"
diff --git a/packages/openmoko-projects/pyefl-sudoku_svn.bb b/packages/openmoko-projects/pyefl-sudoku_svn.bb
index 8c1dfe24ec..f44bc0755e 100644
--- a/packages/openmoko-projects/pyefl-sudoku_svn.bb
+++ b/packages/openmoko-projects/pyefl-sudoku_svn.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 DEPENDS = "python-evas python-edje python-ecore"
 RDEPENDS = "python-evas python-edje python-ecore"
 PV = "0.0.2+svnr${SRCREV}"
-PR = "r1.01"
+PR = "r2"
 
 SRC_URI = "svn://svn.projects.openmoko.org/svnroot/;module=pyefl-sudoku;proto=http"
 
diff --git a/packages/openmoko-system/ompower/ompower-init b/packages/openmoko-system/ompower/ompower-init
new file mode 100755
index 0000000000..d24dab06d0
--- /dev/null
+++ b/packages/openmoko-system/ompower/ompower-init
@@ -0,0 +1,5 @@
+#!/bin/sh 
+
+. /etc/init.d/functions
+
+ompower &
diff --git a/packages/openmoko-system/ompower/openmoko/ompower-init b/packages/openmoko-system/ompower/openmoko/ompower-init
new file mode 100755
index 0000000000..0b36867b4d
--- /dev/null
+++ b/packages/openmoko-system/ompower/openmoko/ompower-init
@@ -0,0 +1,7 @@
+#!/bin/sh 
+
+. /etc/init.d/functions
+
+# xset need to be able to reach our display
+export DISPLAY=:0
+ompower &
diff --git a/packages/openmoko-system/ompower_git.bb b/packages/openmoko-system/ompower_git.bb
new file mode 100644
index 0000000000..ff16910901
--- /dev/null
+++ b/packages/openmoko-system/ompower_git.bb
@@ -0,0 +1,24 @@
+DESCRIPTION = "Openmoko Power State handling daemon via DBUS"
+LICENSE = "MIT BSD"
+DEPENDS = "ecore edbus"
+PV = "0.0.0+svnr${SRCREV}"
+PR = "r3"
+RDEPENDS = "initscripts"
+
+SRCNAME = "ompower"
+S = "${WORKDIR}/${PN}"
+
+inherit e
+
+#SRC_URI = "file://${HOME}/work/ompower"
+SRC_URI = "svn://svn.openmoko.org/developers/raster/;module=ompower;proto=http"
+
+SRC_URI += "file://ompower-init"
+inherit update-rc.d
+do_install_prepend() {
+  install -d ${D}${sysconfdir}/init.d/
+  install -m 0755 ${WORKDIR}/ompower-init ${D}${sysconfdir}/init.d/ompower
+}
+
+INITSCRIPT_NAME = "ompower"
+INITSCRIPT_PARAMS = "defaults 21"
diff --git a/packages/openmoko-tools/openmoko-set-root-password.bb b/packages/openmoko-tools/openmoko-set-root-password.bb
index f64c7031c1..6176d4aef9 100644
--- a/packages/openmoko-tools/openmoko-set-root-password.bb
+++ b/packages/openmoko-tools/openmoko-set-root-password.bb
@@ -3,12 +3,13 @@ SUMMARY = "On installation you will be prompted to set a root password. With \
 this password you can then log into the machine."
 LICENSE = "GPL"
 DEPENDS = "gtk+"
-PKG_TAGS_${PN} = "group::programming"
+PKG_TAGS_${PN} = "group::programming alias::Root_Password"
 
 SRC_URI = "svn://svn.openmoko.org/developers/zecke/;module=root-password;proto=http"
 S = "${WORKDIR}/root-password"
 PV = "1.0+svnr${SRCREV}"
 PE = "1"
+PR = "r1"
 
 do_compile () {
     cd ${S}
diff --git a/packages/openmoko2/openmoko-asu-om20072-support.bb b/packages/openmoko2/openmoko-asu-om20072-support.bb
new file mode 100644
index 0000000000..9b0847f55c
--- /dev/null
+++ b/packages/openmoko2/openmoko-asu-om20072-support.bb
@@ -0,0 +1,27 @@
+DESCRIPTION = "Theme support and defaults to integrate OM2007.2 in the April Software Update"
+LICENSE = "GPL"
+SECTION = "x11"
+RDEPENDS_${PN} = "openmoko-common2"
+
+ALLOW_EMPTY_${PN} = "1"
+PACKAGE_ARCH = "all"
+
+pkg_postinst_${PN} () {
+#!/bin/sh -e
+if [ "x$D" != "x" ]; then
+    exit 1
+fi
+
+gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/theme Moko
+gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/icon_theme openmoko-standard
+gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/font_name "Sans 5"
+gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/wallpaper ${datadir}/pixmaps/wallpaper.png
+gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type bool --set /desktop/poky/interface/digital_clock 1
+gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type int --set /desktop/poky/peripherals/mouse/drag_threshold 8
+gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type int --set /desktop/openmoko/neod/power_management 2
+# gstreamer audio settings
+#gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct -t string --set /system/gstreamer/0.10/default/audiosink pulsesink
+#gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct -t string --set /system/gstreamer/0.10/default/audiosrc pulsesrc
+
+}
+
diff --git a/packages/openmoko2/openmoko-calculator2_svn.bb b/packages/openmoko2/openmoko-calculator2_svn.bb
index ba202bcec9..66a8707c6f 100644
--- a/packages/openmoko2/openmoko-calculator2_svn.bb
+++ b/packages/openmoko2/openmoko-calculator2_svn.bb
@@ -2,6 +2,14 @@ DESCRIPTION = "A Calculator for Openmoko"
 SECTION = "openmoko/tools"
 DEPENDS = "libmokoui2"
 PV = "0.1.0+svnr${SRCREV}"
-PR = "r0"
+PR = "r1"
 
 inherit openmoko2
+SRC_URI += " file://openmoko-calculator.png "
+
+do_install_append_openmoko() {
+        install -d ${D}/${datadir}/pixmaps/
+        install ${WORKDIR}//openmoko-calculator.png ${D}/${datadir}/pixmaps/openmoko-calculator.png
+}
+
+PKG_TAGS_${PN} = "group::unknown alias::Om_Calculator"
diff --git a/packages/openmoko2/openmoko-contacts2_svn.bb b/packages/openmoko2/openmoko-contacts2_svn.bb
index d380f32327..203ced3924 100644
--- a/packages/openmoko2/openmoko-contacts2_svn.bb
+++ b/packages/openmoko2/openmoko-contacts2_svn.bb
@@ -1,9 +1,10 @@
 DESCRIPTION = "The Openmoko Address Book"
 SECTION = "openmoko/pim"
+PKG_TAGS_${PN} = "group::communication alias::Om_Contacts2"
 DEPENDS = "libmokoui2 libmokojournal2 dbus-glib"
 RDEPENDS = "libedata-book"
 PV = "0.1.0+svnr${SRCREV}"
-PR = "r5"
+PR = "r6"
 
 inherit openmoko2
 
diff --git a/packages/openmoko2/openmoko-dates2_svn.bb b/packages/openmoko2/openmoko-dates2_svn.bb
index ff3bfa62a6..7a1fb7a6ac 100644
--- a/packages/openmoko2/openmoko-dates2_svn.bb
+++ b/packages/openmoko2/openmoko-dates2_svn.bb
@@ -3,7 +3,7 @@ SECTION = "openmoko/pim"
 DEPENDS = "libmokoui2 libmokojournal2 gtk+ libglade eds-dbus libjana"
 RDEPENDS = "libedata-cal"
 PV = "0.1.0+svnr${SRCREV}"
-PR = "r2"
+PR = "r3"
 
 inherit openmoko2 pkgconfig
 
@@ -16,4 +16,4 @@ do_configure_prepend() {
 	touch gtk-doc.make
 }
 
-
+PKG_TAGS_${PN} = "group::communication alias::Om_Dates2"
diff --git a/packages/openmoko2/openmoko-dialer2_svn.bb b/packages/openmoko2/openmoko-dialer2_svn.bb
index fa76c44a14..2d8bad42be 100644
--- a/packages/openmoko2/openmoko-dialer2_svn.bb
+++ b/packages/openmoko2/openmoko-dialer2_svn.bb
@@ -1,8 +1,9 @@
 DESCRIPTION = "The Openmoko Dialer"
 SECTION = "openmoko/pim"
+PKG_TAGS_${PN} = "group::communication alias::Om_Dialer2"
 DEPENDS = "libgsmd libjana libmokoui2 libmokojournal2 pulseaudio libnotify"
 PV = "0.1.0+svnr${SRCREV}"
-PR = "r8"
+PR = "r9"
 PE = "1"
 
 inherit openmoko2
diff --git a/packages/openmoko2/openmoko-mediaplayer2_svn.bb b/packages/openmoko2/openmoko-mediaplayer2_svn.bb
index 79a8163328..4addc51a55 100644
--- a/packages/openmoko2/openmoko-mediaplayer2_svn.bb
+++ b/packages/openmoko2/openmoko-mediaplayer2_svn.bb
@@ -1,9 +1,9 @@
 DESCRIPTION = "A media player for Openmoko"
 SECTION = "openmoko/tools"
 DEPENDS = "libmokoui2 expat gstreamer libspiff curl"
-RDEPENDS = "gst-meta-audio gconf openmoko-sound-system2"
+RDEPENDS = "gst-meta-audio gconf gst-plugin-alsa"
 PV = "0.1.0+svnr${SRCREV}"
-PR = "r4"
+PR = "r6"
 
 inherit openmoko2
 
@@ -23,3 +23,4 @@ fi
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule ${sysconfdir}/gconf/schemas/openmoko-mediaplayer.schemas > /dev/null
 }
+PKG_TAGS_${PN} = "group::unknown alias::Om_Mediaplayer2"
diff --git a/packages/openmoko2/openmoko-messages2_svn.bb b/packages/openmoko2/openmoko-messages2_svn.bb
index f28f7f8e0a..d68cd71c95 100644
--- a/packages/openmoko2/openmoko-messages2_svn.bb
+++ b/packages/openmoko2/openmoko-messages2_svn.bb
@@ -2,7 +2,8 @@ DESCRIPTION = "The Openmoko Message application"
 SECTION = "openmoko/pim"
 DEPENDS = "libmokogsmd2 libmokoui2 libmokojournal2 libjana"
 PV = "0.1.0+svnr${SRCREV}"
-PR = "r1"
+PR = "r2"
+PKG_TAGS_${PN} = "group::communication alias::Om_Messages2"
 
 inherit openmoko2
 
diff --git a/packages/openmoko2/openmoko-terminal2_svn.bb b/packages/openmoko2/openmoko-terminal2_svn.bb
index 3a5ef204ff..48adca8e96 100644
--- a/packages/openmoko2/openmoko-terminal2_svn.bb
+++ b/packages/openmoko2/openmoko-terminal2_svn.bb
@@ -3,6 +3,7 @@ SECTION = "openmoko/applications"
 DEPENDS = "vala-native vte libmokoui2"
 RDEPENDS = "ttf-liberation-mono"
 PV = "3.0.0+svnr${SRCREV}"
-PR = "r1"
+PR = "r2"
+PKG_TAGS_${PN} = "group::programming alias::Om_Terminal2"
 
 inherit openmoko2
diff --git a/packages/python/python-xlib_0.14.bb b/packages/python/python-xlib_0.14.bb
new file mode 100644
index 0000000000..ef4a3b9e80
--- /dev/null
+++ b/packages/python/python-xlib_0.14.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "Python Bindings for X Library"
+HOMEPAGE = "http://sourceforge.net/projects/python-xlib/"
+SECTION = "devel/python"
+PRIORITY = "optional"
+LICENSE = "GPL"
+RDEPENDS = ""
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
+
+SRCNAME = "python-xlib"
+
+inherit distutils
diff --git a/packages/tasks/task-openmoko-asu-feed.bb b/packages/tasks/task-openmoko-asu-feed.bb
new file mode 100644
index 0000000000..eb74500d57
--- /dev/null
+++ b/packages/tasks/task-openmoko-asu-feed.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "Openmoko: Misc. Feed Items for ASU"
+SECTION = "openmoko/base"
+LICENSE = "MIT"
+PR = "r0.08"
+
+inherit task
+
+RDEPENDS_task-openmoko-asu-feed = "\
+        xterm \
+        openmoko-agpsui \
+        task-openmoko-net \
+        task-openmoko-ui \
+        task-openmoko-base \
+        task-openmoko-phone \
+        task-openmoko-games \
+        task-openmoko-pim \
+"
diff --git a/packages/tasks/task-openmoko-asu.bb b/packages/tasks/task-openmoko-asu.bb
index 4c02abc260..8ad6804a92 100644
--- a/packages/tasks/task-openmoko-asu.bb
+++ b/packages/tasks/task-openmoko-asu.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "Openmoko: Om 2008.8 August Software Update"
 SECTION = "openmoko/base"
 ALLOW_EMPTY = "1"
 LICENSE = "MIT"
-PR = "r2.03"
+PR = "r3"
 
 inherit task
 
@@ -17,9 +17,7 @@ RDEPENDS_task-openmoko-asu = "\
   connman-plugin-connman-dhclient \
   connman-plugin-connman-80211 \
   connman-script-dhclient \
-  e-wm \
-  illume \
-  illume-theme \
+  task-x11-illume \
   assassin \
   diversity-daemon \
   om-locations \
@@ -36,6 +34,19 @@ RDEPENDS_task-openmoko-asu = "\
   etk-theme-ninja \
   openmoko-community-repository \
   assassin-thumbnail \
+"
+
+RDEPENDS_task-openmoko-asu_append_om-gta02 = "\
+  connman \
+  connman-plugin-dhclient \
+  connman-plugin-hal \
+  connman-plugin-ipv4 \
+  connman-plugin-netdev \
+  connman-plugin-resolvconf \
+  connman-plugin-resolvfile \
+  connman-plugin-rtnllink \
+  connman-plugin-wifi \
+  connman-script-dhclient \
   pyefl-sudoku \
   \
 # For supporting the om2007.2 stack
diff --git a/packages/tasks/task-openmoko-basic.bb b/packages/tasks/task-openmoko-basic.bb
new file mode 100644
index 0000000000..237703a7d9
--- /dev/null
+++ b/packages/tasks/task-openmoko-basic.bb
@@ -0,0 +1,44 @@
+DESCRIPTION = "Openmoko: Tasks for the Openmoko Linux Distribution"
+SECTION = "openmoko/base"
+LICENSE = "MIT"
+PR = "r0.05"
+
+inherit task
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+PACKAGES = "task-openmoko-basic"
+
+DESCRIPTION_task-openmoko-qtopia-x11 = "Openmoko: Provide Window Manager, Om-settings and Om-installer"
+RDEPENDS_task-openmoko-basic = "\
+           readline \
+           connman \
+           connman-plugin-dhclient \
+           connman-plugin-hal \
+           connman-plugin-ipv4 \
+           connman-plugin-netdev \
+           connman-plugin-resolvconf \
+           connman-plugin-resolvfile \
+           connman-plugin-rtnllink \
+           connman-plugin-wifi \
+           connman-script-dhclient \
+           libnotify \
+# X
+
+# illume-theme-asu should be first than illume
+# to let opkg install illume-theme-asu first than illume-theme-freesmartphone
+# then we have ASU theme but not FSO theme in default.
+           task-x11-illume \
+           illume-theme-asu \
+           ${XSERVER} \
+           xserver-kdrive-common \
+           xserver-nodm-init \
+           xauth \
+           xhost \
+           xset \
+           xrandr \
+# Om applications
+           assassin \
+           assassin-thumbnail \
+           om-settings \
+           openmoko-community-repository \
+"
diff --git a/packages/tasks/task-openmoko-debug.bb b/packages/tasks/task-openmoko-debug.bb
index 964b623dca..f30a024824 100644
--- a/packages/tasks/task-openmoko-debug.bb
+++ b/packages/tasks/task-openmoko-debug.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Openmoko: Debugging and Benchmarking Tools"
 SECTION = "openmoko/base"
 LICENSE = "MIT"
-PR = "r59"
+PR = "r59.01"
 
 inherit task
 
@@ -19,7 +19,6 @@ RDEPENDS_task-openmoko-debug = "\
   fstests \
   gdb \
   gdbserver \
-  madplay \
   lrzsz \
   lsof \
   ltrace \
@@ -35,4 +34,5 @@ RDEPENDS_task-openmoko-debug = "\
   vorbis-tools \
   x11perf \
   xev \
+  ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'madplay', d)} \
 "
diff --git a/packages/tasks/task-openmoko-feed.bb b/packages/tasks/task-openmoko-feed.bb
index 9781d7beaf..ab11f61f81 100644
--- a/packages/tasks/task-openmoko-feed.bb
+++ b/packages/tasks/task-openmoko-feed.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Openmoko: Misc. Feed Items"
 SECTION = "openmoko/base"
 LICENSE = "MIT"
-PR = "r47"
+PR = "r54"
 
 inherit task
 
@@ -22,13 +22,13 @@ RDEPENDS_task-openmoko-feed = "\
   kbdd \
   kexec-tools \
   midori \
-  mplayer \
+  ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'mplayer', d)} \
   mtpaint \
   mysql \
   nano \
   ntpclient ntp \
   openssh openssh-scp openssh-ssh openssh-sshd openssh-sftp openssh-misc \
-  python python-pygtk python-pyserial python-gst \
+  python python-pygtk python-pyserial python-gst python-pygame \
   ruby \
   libsdl-x11 libsdl-mixer libsdl-net libsdl-ttf \
   settingsgui \
@@ -38,17 +38,16 @@ RDEPENDS_task-openmoko-feed = "\
   vnc \
   wxwidgets \
   x11vnc \
-#  libswt3.4-gtk-java \
-#  cacao \
-#  jamvm \
-#  classpath \
-#  gpsdrive \
+  libswt3.4-gtk-java \
+  cacao \
+  jamvm \
+  classpath \
+  gpsdrive \
   gpsd \
   asterisk \
-#  gnash \
+  gnash \
   mono \
-#  diversity-daemon \
-#  diversity-maps-taipei \
+  diversity-daemon \
   om-maps-berlin \
   om-maps-buenos-aires \
   om-maps-hong-kong \
@@ -63,14 +62,14 @@ RDEPENDS_task-openmoko-feed = "\
   om-locations \
   om-settings \
   assassin \
-#  assassin-thumbnail \
+  assassin-thumbnail \
   tangogps \
-#  pyefl-sudoku \
+  pyefl-sudoku \
   minicom \
   vim \
-#  iotop \
-#  evince \
-  epdf \
+  iotop \
+  evince \
+  epdfview \
   xprop \
   xev \
   xwininfo \
@@ -81,7 +80,7 @@ RDEPENDS_task-openmoko-feed = "\
   tcpdump \
   gdb \
   lsof \
-#  openmoko-set-root-password \
+  openmoko-set-root-password \
 #  qtopia-phone-enable-debug \
   git \
   navit \
@@ -103,6 +102,8 @@ RDEPENDS_task-openmoko-feed = "\
   epdfview \
   midori \
   microcom \
+  zhone \
+  frameworkd \
   emacs \
 # for werner \
   net-tools \
diff --git a/packages/u-boot/u-boot-mkimage-openmoko-native/boot-menu.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/boot-menu.patch
index 352967ae06..b524ace65d 100644
--- a/packages/u-boot/u-boot-mkimage-openmoko-native/boot-menu.patch
+++ b/packages/u-boot/u-boot-mkimage-openmoko-native/boot-menu.patch
@@ -28,7 +28,7 @@ Index: u-boot/board/neo1973/common/bootmenu.c
 +/*
 + * bootmenu.c - Boot menu
 + *
-+ * Copyright (C) 2006-2007 by OpenMoko, Inc.
++ * Copyright (C) 2006-2007 by Openmoko, Inc.
 + * Written by Werner Almesberger <werner@openmoko.org>
 + * All Rights Reserved
 + *
@@ -370,7 +370,7 @@ Index: u-boot/common/bootmenu.c
 +/*
 + * bootmenu.c - Boot menu
 + *
-+ * Copyright (C) 2006-2007 by OpenMoko, Inc.
++ * Copyright (C) 2006-2007 by Openmoko, Inc.
 + * Written by Werner Almesberger <werner@openmoko.org>
 + * All Rights Reserved
 + *
@@ -686,7 +686,7 @@ Index: u-boot/include/bootmenu.h
 +/*
 + * bootmenu.h - Boot menu
 + *
-+ * Copyright (C) 2006-2007 by OpenMoko, Inc.
++ * Copyright (C) 2006-2007 by Openmoko, Inc.
 + * Written by Werner Almesberger <werner@openmoko.org>
 + * All Rights Reserved
 + *
diff --git a/packages/u-boot/u-boot-mkimage-openmoko-native/dynenv-harden.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/dynenv-harden.patch
index cf12352553..e7eca4ede5 100644
--- a/packages/u-boot/u-boot-mkimage-openmoko-native/dynenv-harden.patch
+++ b/packages/u-boot/u-boot-mkimage-openmoko-native/dynenv-harden.patch
@@ -30,7 +30,7 @@ Index: u-boot/include/util.h
 +/*
 + * util.h - Convenience functions
 + *
-+ * (C) Copyright 2006-2007 OpenMoko, Inc.
++ * (C) Copyright 2006-2007 Openmoko, Inc.
 + * Author: Werner Almesberger <werner@openmoko.org>
 + *
 + * This program is free software; you can redistribute it and/or
diff --git a/packages/u-boot/u-boot-mkimage-openmoko-native/env_nand_oob.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/env_nand_oob.patch
index 5a2dd61461..d3334d0335 100644
--- a/packages/u-boot/u-boot-mkimage-openmoko-native/env_nand_oob.patch
+++ b/packages/u-boot/u-boot-mkimage-openmoko-native/env_nand_oob.patch
@@ -112,7 +112,7 @@ Index: u-boot/common/cmd_dynenv.c
 +++ u-boot/common/cmd_dynenv.c
 @@ -0,0 +1,85 @@
 +/*
-+ * (C) Copyright 2006-2007 OpenMoko, Inc.
++ * (C) Copyright 2006-2007 Openmoko, Inc.
 + * Author: Harald Welte <laforge@openmoko.org>
 + *
 + * This program is free software; you can redistribute it and/or
diff --git a/packages/u-boot/u-boot-mkimage-openmoko-native/nand-otp.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/nand-otp.patch
index b0e9bf4c4b..1f49544282 100644
--- a/packages/u-boot/u-boot-mkimage-openmoko-native/nand-otp.patch
+++ b/packages/u-boot/u-boot-mkimage-openmoko-native/nand-otp.patch
@@ -138,7 +138,7 @@ Index: u-boot/board/neo1973/gta01/nand.c
 +/*
 + * nand.c - Board-specific NAND setup
 + *
-+ * Copyright (C) 2007 by OpenMoko, Inc.
++ * Copyright (C) 2007 by Openmoko, Inc.
 + * Written by Werner Almesberger <werner@openmoko.org>
 + * All Rights Reserved
 + *
@@ -264,7 +264,7 @@ Index: u-boot/board/neo1973/gta02/nand.c
 +/*
 + * nand.c - Board-specific NAND setup
 + *
-+ * Copyright (C) 2007 by OpenMoko, Inc.
++ * Copyright (C) 2007 by Openmoko, Inc.
 + * Written by Werner Almesberger <werner@openmoko.org>
 + * All Rights Reserved
 + *
diff --git a/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-20061030-neo1973.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-20061030-neo1973.patch
index 7c70244b38..3daa3bc1e8 100644
--- a/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-20061030-neo1973.patch
+++ b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-20061030-neo1973.patch
@@ -182,7 +182,7 @@ Index: u-boot/include/pcf50606.h
 +#define _PCF50606_H
 +
 +/* Philips PCF50606 Power Managemnt Unit (PMU) driver
-+ * (C) 2006-2007 by OpenMoko, Inc.
++ * (C) 2006-2007 by Openmoko, Inc.
 + * Author: Harald Welte <laforge@openmoko.org>
 + *
 + */
@@ -457,7 +457,7 @@ Index: u-boot/board/neo1973/common/cmd_neo1973.c
 +++ u-boot/board/neo1973/common/cmd_neo1973.c
 @@ -0,0 +1,99 @@
 +/*
-+ * (C) Copyright 2006 by OpenMoko, Inc.
++ * (C) Copyright 2006 by Openmoko, Inc.
 + * Author: Harald Welte <laforge@openmoko.org>
 + *
 + * See file CREDITS for list of people who contributed to this
@@ -562,7 +562,7 @@ Index: u-boot/board/neo1973/common/jbt6k74.c
 @@ -0,0 +1,420 @@
 +/* u-boot driver for the tpo JBT6K74-AS LCM ASIC
 + *
-+ * Copyright (C) 2006-2007 by OpenMoko, Inc.
++ * Copyright (C) 2006-2007 by Openmoko, Inc.
 + * Author: Harald Welte <laforge@openmoko.org>
 + * All rights reserved.
 + *
@@ -1288,7 +1288,7 @@ Index: u-boot/board/neo1973/gta01/gta01.c
 +++ u-boot/board/neo1973/gta01/gta01.c
 @@ -0,0 +1,422 @@
 +/*
-+ * (C) 2006 by OpenMoko, Inc.
++ * (C) 2006 by Openmoko, Inc.
 + * Author: Harald Welte <laforge@openmoko.org>
 + *
 + * based on existing S3C2410 startup code in u-boot:
@@ -1945,7 +1945,7 @@ Index: u-boot/include/configs/neo1973_gta01.h
 +++ u-boot/include/configs/neo1973_gta01.h
 @@ -0,0 +1,265 @@
 +/*
-+ * (C) Copyright 2006 OpenMoko, Inc.
++ * (C) Copyright 2006 Openmoko, Inc.
 + * Author: Harald Welte <laforge@openmoko.org>
 + *
 + * Configuation settings for the FIC Neo1973 GTA01 Linux GSM phone
diff --git a/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-20061030-qt2410.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-20061030-qt2410.patch
index 343598902f..feedd8bb39 100644
--- a/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-20061030-qt2410.patch
+++ b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-20061030-qt2410.patch
@@ -725,7 +725,7 @@ Index: u-boot/board/qt2410/qt2410.c
 +++ u-boot/board/qt2410/qt2410.c
 @@ -0,0 +1,152 @@
 +/*
-+ * (C) 2006 by OpenMoko, Inc.
++ * (C) 2006 by Openmoko, Inc.
 + * Author: Harald Welte <laforge@openmoko.org>
 + *
 + * based on existing S3C2410 startup code in u-boot:
diff --git a/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-cmd_s3c2410.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-cmd_s3c2410.patch
index 993ef4f6f2..4e63908c67 100644
--- a/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-cmd_s3c2410.patch
+++ b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-cmd_s3c2410.patch
@@ -22,7 +22,7 @@ Index: u-boot/cpu/arm920t/s3c24x0/cmd_s3c2410.c
 +++ u-boot/cpu/arm920t/s3c24x0/cmd_s3c2410.c	2007-02-24 15:22:17.000000000 +0100
 @@ -0,0 +1,152 @@
 +/*
-+ * (C) Copyright 2006 by OpenMoko, Inc.
++ * (C) Copyright 2006 by Openmoko, Inc.
 + * Author: Harald Welte <laforge@openmoko.org>
 + *
 + * See file CREDITS for list of people who contributed to this
diff --git a/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-dfu.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-dfu.patch
index 1122f4894f..ad319c0a26 100644
--- a/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-dfu.patch
+++ b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-dfu.patch
@@ -101,7 +101,7 @@ Index: u-boot/drivers/usbdfu.c
 +++ u-boot/drivers/usbdfu.c
 @@ -0,0 +1,1069 @@
 +/*
-+ * (C) 2007 by OpenMoko, Inc.
++ * (C) 2007 by Openmoko, Inc.
 + * Author: Harald Welte <laforge@openmoko.org>
 + *
 + * based on existing SAM7DFU code from OpenPCD:
@@ -1328,7 +1328,7 @@ Index: u-boot/include/configs/neo1973_gta01.h
  #endif
  
 @@ -184,6 +184,10 @@
- #define CONFIG_USBD_MANUFACTURER	"OpenMoko, Inc"
+ #define CONFIG_USBD_MANUFACTURER	"Openmoko, Inc"
  #define CONFIG_USBD_PRODUCT_NAME	"Neo1973 Bootloader " U_BOOT_VERSION
  #define CONFIG_EXTRA_ENV_SETTINGS 	"usbtty=cdc_acm\0"
 +#define CONFIG_USBD_DFU			1
@@ -1347,7 +1347,7 @@ Index: u-boot/include/usb_dfu.h
 +#define _DFU_H
 +
 +/* USB Device Firmware Update Implementation for u-boot
-+ * (C) 2007 by OpenMoko, Inc.
++ * (C) 2007 by Openmoko, Inc.
 + * Author: Harald Welte <laforge@openmoko.org>
 + *
 + * based on: USB Device Firmware Update Implementation for OpenPCD
@@ -1651,7 +1651,7 @@ Index: u-boot/tools/mkudfu.c
 @@ -0,0 +1,314 @@
 +/*
 + * USB DFU file trailer tool
-+ * (C) Copyright by OpenMoko, Inc.
++ * (C) Copyright by Openmoko, Inc.
 + * Author: Harald Welte <laforge@openmoko.org>
 + *
 + * based on mkimage.c, copyright information as follows:
diff --git a/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-gta02.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-gta02.patch
index ca54ebeff7..ad6b612012 100644
--- a/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-gta02.patch
+++ b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-gta02.patch
@@ -90,7 +90,7 @@ Index: u-boot/board/neo1973/gta02/gta02.c
 +++ u-boot/board/neo1973/gta02/gta02.c
 @@ -0,0 +1,313 @@
 +/*
-+ * (C) 2006-2007 by OpenMoko, Inc.
++ * (C) 2006-2007 by Openmoko, Inc.
 + * Author: Harald Welte <laforge@openmoko.org>
 + *
 + * based on existing S3C2410 startup code in u-boot:
@@ -471,7 +471,7 @@ Index: u-boot/include/configs/neo1973_gta02.h
 +++ u-boot/include/configs/neo1973_gta02.h
 @@ -0,0 +1,276 @@
 +/*
-+ * (C) Copyright 2007 OpenMoko, Inc.
++ * (C) Copyright 2007 Openmoko, Inc.
 + * Author: Harald Welte <laforge@openmoko.org>
 + *
 + * Configuation settings for the FIC Neo1973 GTA02 Linux GSM phone
@@ -647,7 +647,7 @@ Index: u-boot/include/configs/neo1973_gta02.h
 +#define CONFIG_USBD_VENDORID 		0x1457     /* Linux/NetChip */
 +#define CONFIG_USBD_PRODUCTID_GSERIAL	0x5120    /* gserial */
 +#define CONFIG_USBD_PRODUCTID_CDCACM 	0x5119    /* CDC ACM */
-+#define CONFIG_USBD_MANUFACTURER	"OpenMoko, Inc"
++#define CONFIG_USBD_MANUFACTURER	"Openmoko, Inc"
 +#define CONFIG_USBD_PRODUCT_NAME	"Neo1973 Bootloader " U_BOOT_VERSION
 +#define CONFIG_USBD_DFU			1
 +#define CONFIG_USBD_DFU_XFER_SIZE 	4096	/* 0x4000 */
@@ -797,7 +797,7 @@ Index: u-boot/include/pcf50633.h
 +#define _PCF50633_H
 +
 +/* Philips PCF50633 Power Managemnt Unit (PMU) driver
-+ * (C) 2006-2007 by OpenMoko, Inc.
++ * (C) 2006-2007 by Openmoko, Inc.
 + * Author: Harald Welte <laforge@openmoko.org>
 + *
 + */
@@ -1368,7 +1368,7 @@ Index: u-boot/drivers/smedia3362.c
 +++ u-boot/drivers/smedia3362.c
 @@ -0,0 +1,125 @@
 +/*
-+ * (C) Copyright 2007 by OpenMoko, Inc.
++ * (C) Copyright 2007 by Openmoko, Inc.
 + * Author: Harald Welte <laforge@openmoko.org>
 + *
 + * This program is free software; you can redistribute it and/or
diff --git a/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-hxd8.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-hxd8.patch
index f85fdea836..676cddbc1e 100644
--- a/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-hxd8.patch
+++ b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-hxd8.patch
@@ -90,7 +90,7 @@ Index: u-boot/board/hxd8/hxd8.c
 +++ u-boot/board/hxd8/hxd8.c
 @@ -0,0 +1,189 @@
 +/*
-+ * (C) Copyright 2007 by OpenMoko, Inc.
++ * (C) Copyright 2007 by Openmoko, Inc.
 + * Author: Harald Welte <laforge@openmoko.org>
 + *
 + * (C) Copyright 2002
@@ -290,7 +290,7 @@ Index: u-boot/board/hxd8/lowlevel_init.S
 + *                     Jan-Derk Bakker (J.D.Bakker@its.tudelft.nl)
 + *
 + * Modified for the FIC HXD8 by Harald Welte <laforge@openmoko.org>
-+ * (C) Copyright 2007 by OpenMoko, Inc.
++ * (C) Copyright 2007 by Openmoko, Inc.
 + *
 + * See file CREDITS for list of people who contributed to this
 + * project.
@@ -460,7 +460,7 @@ Index: u-boot/include/configs/hxd8.h
 +++ u-boot/include/configs/hxd8.h
 @@ -0,0 +1,277 @@
 +/*
-+ * (C) Copyright 2007 OpenMoko, Inc.
++ * (C) Copyright 2007 Openmoko, Inc.
 + * Author: Harald Welte <laforge@openmoko.org>
 + *
 + * Configuation settings for the FIC HXD8
@@ -634,7 +634,7 @@ Index: u-boot/include/configs/hxd8.h
 +#define CONFIG_USBD_VENDORID 		0x1457     /* Linux/NetChip */
 +#define CONFIG_USBD_PRODUCTID_GSERIAL	0x5120    /* gserial */
 +#define CONFIG_USBD_PRODUCTID_CDCACM 	0x511a    /* CDC ACM */
-+#define CONFIG_USBD_MANUFACTURER	"OpenMoko, Inc"
++#define CONFIG_USBD_MANUFACTURER	"Openmoko, Inc"
 +#define CONFIG_USBD_PRODUCT_NAME	"HXD8 Bootloader " U_BOOT_VERSION
 +#define CONFIG_USBD_DFU			1
 +#define CONFIG_USBD_DFU_XFER_SIZE 	4096	/* 0x4000 */
diff --git a/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-license.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-license.patch
index 227a97e71a..fa8db6f69d 100644
--- a/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-license.patch
+++ b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-license.patch
@@ -17,7 +17,7 @@ Index: u-boot/common/cmd_license.c
 +++ u-boot/common/cmd_license.c
 @@ -0,0 +1,57 @@
 +/*
-+ * (C) Copyright 2007 by OpenMoko, Inc.
++ * (C) Copyright 2007 by Openmoko, Inc.
 + * Author: Harald Welte <laforge@openmoko.org>
 + *
 + * See file CREDITS for list of people who contributed to this
diff --git a/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-neo1973-defaultenv.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-neo1973-defaultenv.patch
index 7e3aa4f480..9753526d92 100644
--- a/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-neo1973-defaultenv.patch
+++ b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-neo1973-defaultenv.patch
@@ -15,7 +15,7 @@ Index: u-boot/include/configs/neo1973_gta01.h
  
 @@ -181,11 +181,14 @@
  #define CONFIG_USBD_PRODUCTID_CDCACM 	0x5119    /* CDC ACM */
- #define CONFIG_USBD_MANUFACTURER	"OpenMoko, Inc"
+ #define CONFIG_USBD_MANUFACTURER	"Openmoko, Inc"
  #define CONFIG_USBD_PRODUCT_NAME	"Neo1973 Bootloader " U_BOOT_VERSION
 -#define CONFIG_EXTRA_ENV_SETTINGS 	"usbtty=cdc_acm\0"
  #define CONFIG_USBD_DFU			1
diff --git a/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-s3c2410-mmc.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-s3c2410-mmc.patch
index b775beaa07..2d185f7a41 100644
--- a/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-s3c2410-mmc.patch
+++ b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-s3c2410-mmc.patch
@@ -23,7 +23,7 @@ Index: u-boot/cpu/arm920t/s3c24x0/mmc.c
 @@ -0,0 +1,531 @@
 +/*
 + * u-boot S3C2410 MMC/SD card driver
-+ * (C) Copyright 2006 by OpenMoko, Inc.
++ * (C) Copyright 2006 by Openmoko, Inc.
 + * Author: Harald Welte <laforge@openmoko.org>
 + *
 + * based on u-boot pxa MMC driver and linux/drivers/mmc/s3c2410mci.c
diff --git a/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-s3c2410-nand.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-s3c2410-nand.patch
index dc363bbbab..9c10edc958 100644
--- a/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-s3c2410-nand.patch
+++ b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-s3c2410-nand.patch
@@ -22,7 +22,7 @@ Index: u-boot/cpu/arm920t/s3c24x0/nand.c
 +++ u-boot/cpu/arm920t/s3c24x0/nand.c	2007-03-01 14:30:27.000000000 +0100
 @@ -0,0 +1,225 @@
 +/*
-+ * (C) Copyright 2006 OpenMoko, Inc.
++ * (C) Copyright 2006 Openmoko, Inc.
 + * Author: Harald Welte <laforge@openmoko.org>
 + *
 + * This program is free software; you can redistribute it and/or
@@ -264,7 +264,7 @@ Index: u-boot/cpu/arm920t/s3c24x0/nand_read.c
 + * Author: Hwang, Chideok <hwang@mizi.com>
 + * Date  : $Date: 2004/02/04 10:37:37 $
 + *
-+ * u-boot integration and bad-block skipping (C) 2006 by OpenMoko, Inc.
++ * u-boot integration and bad-block skipping (C) 2006 by Openmoko, Inc.
 + * Author: Harald Welte <laforge@openmoko.org>
 + */
 +
@@ -359,7 +359,7 @@ Index: u-boot/cpu/arm920t/start.S
   *
 + * S3C2410 NAND portions
 + *  Copyright (c) 2001  MIZI Research, Inc.
-+ *  Copyright (c) 2006  OpenMoko, Inc. (Harald Welte <laforge@openmmoko.org>
++ *  Copyright (c) 2006  Openmoko, Inc. (Harald Welte <laforge@openmmoko.org>
 + *
   * See file CREDITS for list of people who contributed to this
   * project.
diff --git a/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-s3c2410_fb.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-s3c2410_fb.patch
index b50853554b..9ed81b9cb6 100644
--- a/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-s3c2410_fb.patch
+++ b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-s3c2410_fb.patch
@@ -17,7 +17,7 @@ Index: u-boot/drivers/s3c2410_fb.c
 +++ u-boot/drivers/s3c2410_fb.c
 @@ -0,0 +1,166 @@
 +/*
-+ * (C) Copyright 2006 by OpenMoko, Inc.
++ * (C) Copyright 2006 by Openmoko, Inc.
 + * Author: Harald Welte <laforge@openmoko.org>
 + *
 + * This program is free software; you can redistribute it and/or
diff --git a/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-s3c2410_udc.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-s3c2410_udc.patch
index 16bee3e26a..8dadbbb7de 100644
--- a/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-s3c2410_udc.patch
+++ b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-s3c2410_udc.patch
@@ -20,7 +20,7 @@ Index: u-boot/drivers/usbdcore_s3c2410.c
 @@ -0,0 +1,730 @@
 +/* S3C2410 USB Device Controller Driver for u-boot
 + *
-+ * (C) Copyright 2007 by OpenMoko, Inc.
++ * (C) Copyright 2007 by Openmoko, Inc.
 + * Author: Harald Welte <laforge@openmoko.org>
 + *
 + * based on Linux' s3c2410_udc.c, which is
@@ -1137,7 +1137,7 @@ Index: u-boot/include/configs/neo1973_gta01.h
 +#define CONFIG_USBD_VENDORID 		0x1457     /* Linux/NetChip */
 +#define CONFIG_USBD_PRODUCTID_GSERIAL	0x5120    /* gserial */
 +#define CONFIG_USBD_PRODUCTID_CDCACM 	0x5119    /* CDC ACM */
-+#define CONFIG_USBD_MANUFACTURER	"OpenMoko, Inc"
++#define CONFIG_USBD_MANUFACTURER	"Openmoko, Inc"
 +#define CONFIG_USBD_PRODUCT_NAME	"Neo1973 Bootloader " U_BOOT_VERSION
 +#define CONFIG_EXTRA_ENV_SETTINGS 	"usbtty=cdc_acm\0"
 +
diff --git a/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-s3c2443.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-s3c2443.patch
index 62ae5592ab..b2e94d4428 100644
--- a/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-s3c2443.patch
+++ b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-s3c2443.patch
@@ -149,7 +149,7 @@ Index: u-boot/include/s3c2443.h
 +++ u-boot/include/s3c2443.h
 @@ -0,0 +1,106 @@
 +/*
-+ * (C) Copyright 2007 OpenMoko, Inc.
++ * (C) Copyright 2007 Openmoko, Inc.
 + * Author: Harald Welte <laforge@openmoko.org>
 + *
 + * See file CREDITS for list of people who contributed to this
diff --git a/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-smdk2440.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-smdk2440.patch
index 09392ad2cf..25d34de66a 100644
--- a/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-smdk2440.patch
+++ b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-smdk2440.patch
@@ -207,7 +207,7 @@ Index: u-boot/include/configs/smdk2440.h
 +#define CONFIG_USBD_VENDORID		0x1457	/* FIC */
 +#define CONFIG_USBD_PRODUCTID_GSERIAL	0x5120	/* gserial */
 +#define CONFIG_USBD_PRODUCTID_CDCACM	0x511b	/* SMDK2440 CDC ACM */
-+#define CONFIG_USBD_MANUFACTURER	"OpenMoko, Inc."
++#define CONFIG_USBD_MANUFACTURER	"Openmoko, Inc."
 +#define CONFIG_USBD_PRODUCT_NAME	"S3C2440 Bootloader " U_BOOT_VERSION
 +#define CONFIG_EXTRA_ENV_SETTINGS	"usbtty=cdc_acm\0"
 +#define CONFIG_USBD_DFU			1
diff --git a/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-smdk2443.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-smdk2443.patch
index 5757cc078b..285c546e73 100644
--- a/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-smdk2443.patch
+++ b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-smdk2443.patch
@@ -90,7 +90,7 @@ Index: u-boot/board/smdk2443/smdk2443.c
 +++ u-boot/board/smdk2443/smdk2443.c
 @@ -0,0 +1,147 @@
 +/*
-+ * (C) Copyright 2006 OpenMoko, Inc.
++ * (C) Copyright 2006 Openmoko, Inc.
 + * Author: Harald Welte <laforge@openmoko.org>
 + *
 + * See file CREDITS for list of people who contributed to this
@@ -305,7 +305,7 @@ Index: u-boot/include/configs/smdk2443.h
 +++ u-boot/include/configs/smdk2443.h
 @@ -0,0 +1,289 @@
 +/*
-+ * (C) Copyright 2007 OpenMoko, Inc.
++ * (C) Copyright 2007 Openmoko, Inc.
 + * Author: Harald Welte <laforge@openmoko.org>
 + *
 + * Configuation settings for the SAMSUNG SMDK2443 board.
@@ -688,7 +688,7 @@ Index: u-boot/board/smdk2443/lowlevel_init.S
 +/*
 + * SMDK2443 Memory Setup
 + *
-+ * Copyright (C) 2007 by OpenMoko, Inc.
++ * Copyright (C) 2007 by Openmoko, Inc.
 + * Author: Harald Welte <laforge@openmoko.org>
 + *
 + * See file CREDITS for list of people who contributed to this
diff --git a/packages/u-boot/u-boot-openmoko.inc b/packages/u-boot/u-boot-openmoko.inc
index 2238d3662a..0329212f4c 100644
--- a/packages/u-boot/u-boot-openmoko.inc
+++ b/packages/u-boot/u-boot-openmoko.inc
@@ -1,5 +1,4 @@
 DESCRIPTION = "U-boot bootloader w/ Neo1973 (GTA01) and Neo FreeRunner (GTA02) support"
-AUTHOR = "Harald Welte <laforge@openmoko.org> et. al."
 LICENSE = "GPL"
 SECTION = "bootloader"
 PRIORITY = "optional"
diff --git a/packages/wvdial/wvdial_1.60.bb b/packages/wvdial/wvdial_1.60.bb
index c4a003a2ec..29532b241c 100644
--- a/packages/wvdial/wvdial_1.60.bb
+++ b/packages/wvdial/wvdial_1.60.bb
@@ -1,6 +1,8 @@
 HOMEPAGE = "http://www.alumnit.ca/wiki/?WvDial"
 DESCRIPTION = "WvDial is a program that makes it easy to connect your Linux workstation to the Internet."
 
+PR = "r1"
+
 LICENSE = "LGPL"
 SRC_URI = "http://www.alumnit.ca/download/wvdial-1.60.tar.gz"
 
@@ -11,5 +13,5 @@ EXTRA_OEMAKE = ""
 export WVLINK="${LD}"
 
 do_install() {
-    oe_runmake prefix=${D}/usr PPPDIR=${D}/etc install
+    oe_runmake prefix=${D}/usr PPPDIR=${D}/etc/ppp/peers install
 }
diff --git a/packages/xorg-lib/libxfont-native_1.3.0.bb b/packages/xorg-lib/libxfont-native_1.3.0.bb
index efd1e07d6a..deb66a91cf 100644
--- a/packages/xorg-lib/libxfont-native_1.3.0.bb
+++ b/packages/xorg-lib/libxfont-native_1.3.0.bb
@@ -2,6 +2,7 @@ require libxfont_${PV}.bb
 
 DEPENDS = "xproto-native zlib-native fontcacheproto-native fontsproto-native \
            libfontenc-native xtrans-native freetype-native util-macros-native"
+PROVIDES = "${P} ${PF} ${PN}"
 PE = "1"
 
 # no need for patch used in libxfont