merge of '63f976f7eeeabc5489e45b1df04c88319cd77447'

     and 'f20a9853a5bcc15b88f7b9aa12eedd2fd6d65ec3'

45 files changed, 340 insertions, 202 deletions

diff --git a/classes/distutils.bbclass b/classes/distutils.bbclass
index 5f57a9ea19..db15cebdd7 100644
--- a/classes/distutils.bbclass
+++ b/classes/distutils.bbclass
@@ -10,6 +10,23 @@ distutils_do_install() {
 	BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
 	${STAGING_BINDIR_NATIVE}/python setup.py install --prefix=${D}/${prefix} --install-data=${D}/${datadir} || \
 	oefatal "python setup.py install execution failed."
+
+        for i in `find ${D} -name "*.py"` ; do \
+            sed -i -e s:${D}::g $i
+        done
+
+        if test -e ${D}${bindir} ; then	
+            for i in ${D}${bindir}/* ; do \
+                sed -i -e s:${STAGING_BINDIR_NATIVE}:${bindir}:g $i
+            done
+        fi
+
+        if test -e ${D}${sbindir} ; then
+            for i in ${D}${sbindir}/* ; do \
+                sed -i -e s:${STAGING_BINDIR_NATIVE}:${bindir}:g $i
+            done
+        fi
+
 }
 
 EXPORT_FUNCTIONS do_compile do_install
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index 45cd8bb5e8..a9e9e0dbd8 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -103,7 +103,7 @@ FEED_URIS += " \
 		perl##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/perl \
 		python##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/python \
 		debug##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/debug \
-		gstreamer##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/gsteamer \
+		gstreamer##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/gstreamer \
 		${MACHINE}##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/machine/${MACHINE}"
 #        base##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${FEED_ARCH}/base \
 #        ${MACHINE}##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${FEED_ARCH}/machine/${MACHINE} \
@@ -295,11 +295,12 @@ PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap"
 
 
 # add altboot to compatible models, will be replaced with angstrom-bootmanager
+#PREFERRED_VERSION_altboot = "1.0.8+1.0.9_pre1"
 #EXTRA_STUFF_append_c7x0          +=  "altboot"
 #EXTRA_STUFF_append_akita         += "altboot"
-#EXTRA_STUFF_append_spitz         += "altboot"
 #EXTRA_STUFF_append_poodle        += "altboot"
 #EXTRA_STUFF_append_tosa          += "altboot"
+EXTRA_STUFF_append_spitz         += "altboot"
 
 
 # do some task-base stuff here
diff --git a/packages/alsa/alsa-state.bb b/packages/alsa/alsa-state.bb
index 1eacf4269f..e4d23285f3 100644
--- a/packages/alsa/alsa-state.bb
+++ b/packages/alsa/alsa-state.bb
@@ -8,31 +8,19 @@
 # Date: 20070308 (YMD)
 
 DESCRIPTION = "Default ALSA configuration"
-MAINTAINER = "Matthias 'CoreDump' Hentges <oe@hentges.net>"
-HOMEPAGE = "<homepage>"
 LICENSE = "GPL"
 
-######################################################################################
-
 PV = "0.0.3"
 PR = "r0"
 
-######################################################################################
-
 SRC_URI = "file://asound.state \
 	   file://alsa-state"
 
-FILES_${PN} = "/etc/*"
-
-######################################################################################
-
 inherit update-rc.d
 
 INITSCRIPT_NAME = "alsa-state"
 INITSCRIPT_PARAMS = "defaults 10"
 
-######################################################################################
-
 do_install() {
 	install -d ${D}${sysconfdir}/init.d
 	
@@ -40,6 +28,7 @@ do_install() {
 	install -m 0755 ${WORKDIR}/alsa-state ${D}${sysconfdir}/init.d
 }
 
+FILES_${PN} = "${sysconfdir}/*"
 
 pkg_postinst_${PN}() {
 	if test -x /usr/sbin/alsactl
diff --git a/packages/boost-asio/boost-asio_0.3.7.bb b/packages/boost-asio/boost-asio_0.3.7.bb
index 45b7e22eb1..947f89cae2 100644
--- a/packages/boost-asio/boost-asio_0.3.7.bb
+++ b/packages/boost-asio/boost-asio_0.3.7.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "Asio 0.3.7 for work with boost, should be moved into boost package once integrated into the boost distribution."
 HOMEPAGE = "http://asio.sf.net/"
-MAINTAINER = "Martin Dietze <dietze@4g-systems.com>"
 SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "Boost Software License"
diff --git a/packages/gizmod/gizmod_2.3.bb b/packages/gizmod/gizmod_2.3.bb
index ff9ae25640..bc70aa0414 100644
--- a/packages/gizmod/gizmod_2.3.bb
+++ b/packages/gizmod/gizmod_2.3.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Gizmo Daemon"
 HOMEPAGE = "http://gizmod.sourceforge.net"
 LICENSE = "GPLv2"
-MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
 SECTION = "console/multimedia"
 DEPENDS = "python virtual/libx11 xf86vidmodeproto alsa-lib"
 SRC_URI = "${SOURCEFORGE_MIRROR}/gizmod/gizmod-${PV}.tar.bz2 \
diff --git a/packages/gpesyncd/gpe-synctool_0.2.bb b/packages/gpesyncd/gpe-synctool_0.2.bb
new file mode 100644
index 0000000000..5db87ad995
--- /dev/null
+++ b/packages/gpesyncd/gpe-synctool_0.2.bb
@@ -0,0 +1,8 @@
+DESCRIPTION = "Sync daemon for GPE and OpenSync"
+LICENSE = "GPL"
+DEPENDS = "gtk+ glib-2.0 libgpewidget"
+
+GPE_TARBALL_SUFFIX = "bz2"
+
+inherit gpe autotools
+
diff --git a/packages/gpesyncd/gpe-synctool_svn.bb b/packages/gpesyncd/gpe-synctool_svn.bb
index 2fdc4c7e56..e85013c117 100644
--- a/packages/gpesyncd/gpe-synctool_svn.bb
+++ b/packages/gpesyncd/gpe-synctool_svn.bb
@@ -2,7 +2,9 @@ DESCRIPTION = "Sync daemon for GPE and OpenSync"
 LICENSE = "GPL"
 DEPENDS = "gtk+ glib-2.0 libgpewidget"
 
-PV = "0.0+svn${SRCDATE}"
+DEFAULT_PREFERENCE = "-1"
+
+PV = "0.2+svn${SRCDATE}"
 PR = "r0"
 
 SRC_URI = "${GPE_SVN}"
diff --git a/packages/images/hentges-console-image.bb b/packages/images/hentges-console-image.bb
index 24235b2887..87381a4c77 100644
--- a/packages/images/hentges-console-image.bb
+++ b/packages/images/hentges-console-image.bb
@@ -8,7 +8,6 @@
 # Date: 20070516 (YMD)
 
 DESCRIPTION = "Hentges Console Image"
-MAINTAINER = "Matthias 'CoreDump' Hentges <oe@hentges.net>"
 HOMEPAGE = "http://www.hentges.net/misc/openzaurus/index.shtml"
 LICENSE = "GPL"
 
diff --git a/packages/images/hentges-x11-image.bb b/packages/images/hentges-x11-image.bb
index 84a4fec94f..475f9f0ea9 100644
--- a/packages/images/hentges-x11-image.bb
+++ b/packages/images/hentges-x11-image.bb
@@ -8,7 +8,6 @@
 # Date: 20070522 (YMD)
 
 DESCRIPTION = "Hentges X11 Image"
-MAINTAINER = "Matthias 'CoreDump' Hentges <oe@hentges.net>"
 HOMEPAGE = "http://www.hentges.net/misc/openzaurus/index.shtml"
 LICENSE = "MIT"
 
diff --git a/packages/librcf/librcf_0.4.bb b/packages/librcf/librcf_0.4.bb
index 13012fa803..aad6f7c338 100644
--- a/packages/librcf/librcf_0.4.bb
+++ b/packages/librcf/librcf_0.4.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "A library for object-oriented inter process communication"
 SECTION = "base"
 PRIORITY = "optional"
-MAINTAINER = "Martin Dietze <dietze@4g-systems.com>"
 LICENSE = "unknown"
 DEPENDS="zlib openssl boost-asio"
 RDEPENDS = "libstdc++5 libgcc1"
diff --git a/packages/linux/linux-mtx-3_2.6.15.4.bb b/packages/linux/linux-mtx-3_2.6.15.4.bb
index fe523c879c..1bddcfdd3b 100644
--- a/packages/linux/linux-mtx-3_2.6.15.4.bb
+++ b/packages/linux/linux-mtx-3_2.6.15.4.bb
@@ -1,5 +1,4 @@
 DESCRIPTION = "Linux kernel for MTX-3 (Surfbox3)"
-MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
 HOMEPAGE = "http://meshcube.org/meshwiki/"
 LICENSE = "GPL"
 KV = "${PV}"
diff --git a/packages/linux/linux-mtx-3_2.6.15.bb b/packages/linux/linux-mtx-3_2.6.15.bb
index 178519d798..3dba1fe6a0 100644
--- a/packages/linux/linux-mtx-3_2.6.15.bb
+++ b/packages/linux/linux-mtx-3_2.6.15.bb
@@ -1,5 +1,4 @@
 DESCRIPTION = "Linux kernel for MTX-3 (Surfbox3)"
-MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
 HOMEPAGE = "http://meshcube.org/meshwiki/"
 LICENSE = "GPL"
 KV = "${PV}"
diff --git a/packages/linux/unslung-kernel/defconfig b/packages/linux/unslung-kernel/defconfig
index a5ad6094ae..03247f74b5 100644
--- a/packages/linux/unslung-kernel/defconfig
+++ b/packages/linux/unslung-kernel/defconfig
@@ -758,11 +758,11 @@ CONFIG_SCSI_MULTI_LUN=y
 #
 # Input core support
 #
-# CONFIG_INPUT is not set
+CONFIG_INPUT=m
 # CONFIG_INPUT_KEYBDEV is not set
 # CONFIG_INPUT_MOUSEDEV is not set
 # CONFIG_INPUT_JOYDEV is not set
-# CONFIG_INPUT_EVDEV is not set
+CONFIG_INPUT_EVDEV=m
 
 #
 # Character devices
@@ -1126,13 +1126,13 @@ CONFIG_USB_PRINTER=m
 #
 # USB Human Interface Devices (HID)
 #
-# CONFIG_USB_HID is not set
+CONFIG_USB_HID=m
 
 #
 #     Input core support is needed for USB HID input layer or HIDBP support
 #
-# CONFIG_USB_HIDINPUT is not set
-# CONFIG_USB_HIDDEV is not set
+CONFIG_USB_HIDINPUT=y
+CONFIG_USB_HIDDEV=y
 # CONFIG_USB_KBD is not set
 # CONFIG_USB_MOUSE is not set
 # CONFIG_USB_AIPTEK is not set
diff --git a/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb b/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb
index df3141725c..cb3f9be78b 100644
--- a/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb
+++ b/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb
@@ -1,7 +1,7 @@
 SECTION = "kernel"
 DESCRIPTION = "Vendor-compatible Linux kernel for the Linksys NSLU2 device"
 LICENSE = "GPL"
-PR = "r18"
+PR = "r19"
 
 COMPATIBLE_HOST = 'arm.*-linux'
 COMPATIBLE_MACHINE = "nslu2"
diff --git a/packages/mdk/mdk2_v33.bb b/packages/mdk/mdk2_v33.bb
index bd665e2ccd..02a784d5e3 100644
--- a/packages/mdk/mdk2_v33.bb
+++ b/packages/mdk/mdk2_v33.bb
@@ -2,7 +2,6 @@ SECTION = "console/network"
 DESCRIPTION = "ASPj is drunk"
 HOMEPAGE = "http://homepages.tu-darmstadt.de/~p_larbig/wlan/"
 LICENSE = "GPLv2"
-MAINTAINER = "Zero_Chaos <sidhayn@gmail.com>"
 DEPENDS = ""
 RDEPENDS = ""
 PR="r1"
diff --git a/packages/nylon/simple-firewall.bb b/packages/nylon/simple-firewall.bb
index 4f51f88277..fc7c3de6a3 100644
--- a/packages/nylon/simple-firewall.bb
+++ b/packages/nylon/simple-firewall.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "simple firewall configuratiopn script"
 SECTION = "base"
 PRIORITY = "optional"
-MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
 LICENSE = "GPL"
 DEPENDS = "virtual/kernel"
 #SRCDATE = "20060114"
diff --git a/packages/patcher/patcher-native_20040913.bb b/packages/patcher/patcher-native_20040913.bb
index 7da61e91c2..c071d52404 100644
--- a/packages/patcher/patcher-native_20040913.bb
+++ b/packages/patcher/patcher-native_20040913.bb
@@ -4,7 +4,6 @@ LICENSE = "Perl"
 DEPENDS = ""
 SECTION = "base"
 PRIORITY = "optional"
-MAINTAINER = "Holger Schurig <hs4233@mail.mn-solutions.de>"
 PACKAGES = ""
 PR = "r1"
 
diff --git a/packages/patcher/patcher_20040913.bb b/packages/patcher/patcher_20040913.bb
index af4d91217c..471f75af7b 100644
--- a/packages/patcher/patcher_20040913.bb
+++ b/packages/patcher/patcher_20040913.bb
@@ -4,7 +4,6 @@ LICENSE = "Perl"
 DEPENDS = ""
 SECTION = "base"
 PRIORITY = "optional"
-MAINTAINER = "Holger Schurig <hs4233@mail.mn-solutions.de>"
 INHIBIT_DEFAULT_DEPS = "1"
 
 SRC_URI = "http://www.holgerschurig.de/files/linux/patcher-${PV}.tar.bz2"
diff --git a/packages/pulseaudio/libatomics-ops_1.2.bb b/packages/pulseaudio/libatomics-ops_1.2.bb
new file mode 100644
index 0000000000..c4e838eb78
--- /dev/null
+++ b/packages/pulseaudio/libatomics-ops_1.2.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "A library for atomic integer operations"
+LICENSE = "MIT"
+
+SRC_URI = "http://www.hpl.hp.com/research/linux/atomic_ops/download/libatomic_ops-1.2.tar.gz"
+S = "${WORKDIR}/libatomic_ops-${PV}"
+
+inherit autotools pkgconfig
+
+do_stage() {
+	autotools_stage_all
+}	
diff --git a/packages/pulseaudio/pulse.inc b/packages/pulseaudio/pulse.inc
new file mode 100644
index 0000000000..9cbf9a3f89
--- /dev/null
+++ b/packages/pulseaudio/pulse.inc
@@ -0,0 +1,94 @@
+DESCRIPTION = "Pulseaudio is a sound server for Linux and Unix-like operating systems."
+HOMEPAGE = "http://www.pulseaudio.org"
+AUTHOR = "Lennart Poettering"
+SECTION = "libs/multimedia"
+LICENSE = "LGPL"
+
+DEPENDS = "libatomics-ops liboil avahi libsamplerate0 libsndfile1 libtool"
+# optional
+DEPENDS += "alsa-lib"
+
+PR = "r0"
+
+SRC_URI = "http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-${PV}.tar.gz"
+
+SRC_URI += "file://volatiles.04_pulse"
+
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "\
+                --disable-lynx \
+		--without-x \
+		--without-glib \
+		--without-jack \
+		--with-alsa \
+		--with-oss \
+		"
+
+PARALLEL_MAKE = ""
+
+export TARGET_FPU="${TARGET_FPU}"
+
+do_install_append() {
+	install -d ${D}${sysconfdir}/default/volatiles
+	install -m 0644 ${WORKDIR}/volatiles.04_pulse  ${D}${sysconfdir}/default/volatiles/volatiles.04_pulse
+	
+	if [ "x${TARGET_FPU}" == "xsoft" ] ; then 
+	     sed -i -e s:\;\ resample-method\ =\ sinc-fastest:resample-method\ =\ trivial: ${D}${sysconfdir}/pulse/daemon.conf
+	fi
+}
+
+
+LEAD_SONAME = "libpulse.so"
+
+PACKAGES =+ "${PN}-bin ${PN}-conf"
+PACKAGES_DYNAMIC = "pulseaudio-lib* pulseaudio-module* libpulse-lib* libpulse-module* "
+
+FILES_${PN}-dbg += "${libexecdir}/pulse/.debug \
+                    ${libdir}/pulse-0.9/modules/.debug"
+FILES_${PN}-dev += "${libdir}/pulse-0.9/modules/*.la"		    
+FILES_${PN}-conf = "${sysconfdir}"
+FILES_${PN}-bin = "${bindir}/* \
+                   ${sysconfdir}/default/volatiles/volatiles.04_pulse"
+
+CONFFILES_${PN}-conf = "\ 
+                       ${sysconfdir}/pulse/default.pa \
+		       ${sysconfdir}/pulse/daemon.conf \
+		       ${sysconfdir}/pulse/client.conf \
+		       "
+pkg_postinst_${PN}-bin() {
+if test "x$D" != "x"; then
+        exit 1
+else
+        grep -q pulse: /etc/group || addgroup pulse
+        grep -q pulse: /etc/passwd || \
+            adduser --disabled-password --home=/var/run/pulse/ --system \
+                    --ingroup pulse --no-create-home -g "Pulse audio daemon" pulse                                            
+        /etc/init.d/populate-volatile.sh update
+fi
+}
+
+pkg_postrm${PN}-bin() {
+if test "x$D" != "x"; then
+        exit 1
+else
+        deluser pulse
+fi
+}
+
+
+
+
+do_stage() {
+	autotools_stage_all
+}
+
+
+python populate_packages_prepend() {
+        #bb.data.setVar('PKG_pulseaudio', 'pulseaudio', d)
+
+        plugindir = bb.data.expand('${libdir}/pulse-0.9/modules/', d)
+        do_split_packages(d, plugindir, '^module-(.*)\.so$', 'pulseaudio-module-%s', 'PulseAudio module for %s', extra_depends='' )
+	do_split_packages(d, plugindir, '^lib(.*)\.so$', 'pulseaudio-lib-%s', 'PulseAudio library for %s', extra_depends='' )
+}
diff --git a/packages/pulseaudio/pulseaudio_0.9.5.bb b/packages/pulseaudio/pulseaudio_0.9.5.bb
index 35fd9a8342..4eb2e458ff 100644
--- a/packages/pulseaudio/pulseaudio_0.9.5.bb
+++ b/packages/pulseaudio/pulseaudio_0.9.5.bb
@@ -1,95 +1,3 @@
-DESCRIPTION = "Pulseaudio is a sound server for Linux and Unix-like operating systems."
-HOMEPAGE = "http://www.pulseaudio.org"
-AUTHOR = "Lennart Poettering"
-SECTION = "libs/multimedia"
-LICENSE = "LGPL"
+require pulse.inc
 
-DEPENDS = "liboil avahi libsamplerate0 libsndfile1 libtool"
-# optional
-DEPENDS += "alsa-lib"
-
-
-PR = "r7"
-
-SRC_URI = "http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-${PV}.tar.gz"
-
-SRC_URI += "file://volatiles.04_pulse"
-
-
-inherit autotools pkgconfig
-
-EXTRA_OECONF = "\
-                --disable-lynx \
-		--without-x \
-		--without-glib \
-		--without-jack \
-		--with-alsa \
-		--with-oss \
-		"
-
-PARALLEL_MAKE = ""
-
-export TARGET_FPU="${TARGET_FPU}"
-
-do_install_append() {
-	install -d ${D}${sysconfdir}/default/volatiles
-	install -m 0644 ${WORKDIR}/volatiles.04_pulse  ${D}${sysconfdir}/default/volatiles/volatiles.04_pulse
-	
-	if [ "x${TARGET_FPU}" == "xsoft" ] ; then 
-	     sed -i -e s:\;\ resample-method\ =\ sinc-fastest:resample-method\ =\ trivial: ${D}${sysconfdir}/pulse/daemon.conf
-	fi
-}
-
-
-LEAD_SONAME = "libpulse.so"
-
-PACKAGES =+ "${PN}-bin ${PN}-conf"
-PACKAGES_DYNAMIC = "pulseaudio-module-* pulseaudio-lib-*"
-
-FILES_${PN}-dbg += "${libexecdir}/pulse/.debug \
-                    ${libdir}/pulse-0.9/modules/.debug"
-FILES_${PN}-dev += "${libdir}/pulse-0.9/modules/*.la"		    
-FILES_${PN}-conf = "${sysconfdir}"
-FILES_${PN}-bin = "${bindir}/* \
-                   ${sysconfdir}/default/volatiles/volatiles.04_pulse"
-
-CONFFILES_${PN}-conf = "\ 
-                       ${sysconfdir}/pulse/default.pa \
-		       ${sysconfdir}/pulse/daemon.conf \
-		       ${sysconfdir}/pulse/client.conf \
-		       "
-pkg_postinst_${PN}-bin() {
-if test "x$D" != "x"; then
-        exit 1
-else
-        grep -q pulse: /etc/group || addgroup pulse
-        grep -q pulse: /etc/passwd || \
-            adduser --disabled-password --home=/var/run/pulse/ --system \
-                    --ingroup pulse --no-create-home -g "Pulse audio daemon" pulse                                            
-        /etc/init.d/populate-volatile.sh update
-fi
-}
-
-pkg_postrm${PN}-bin() {
-if test "x$D" != "x"; then
-        exit 1
-else
-        deluser pulse
-fi
-}
-
-
-
-
-do_stage() {
-	autotools_stage_all
-}
-
-
-python populate_packages_prepend() {
-        #bb.data.setVar('PKG_pulseaudio', 'pulseaudio', d)
-
-        plugindir = bb.data.expand('${libdir}/pulse-0.9/modules/', d)
-        do_split_packages(d, plugindir, '^module-(.*)\.so$', 'pulseaudio-module-%s', 'PulseAudio module for %s', extra_depends='' )
-	do_split_packages(d, plugindir, '^lib(.*)\.so$', 'pulseaudio-lib-%s', 'PulseAudio library for %s', extra_depends='' )
-}
+PR  = "r8"
diff --git a/packages/pulseaudio/pulseaudio_0.9.6.bb b/packages/pulseaudio/pulseaudio_0.9.6.bb
new file mode 100644
index 0000000000..cd088c9843
--- /dev/null
+++ b/packages/pulseaudio/pulseaudio_0.9.6.bb
@@ -0,0 +1,3 @@
+require pulse.inc
+
+DEFAULT_PREFERENCE = "-1"
diff --git a/packages/python/fix-path.inc b/packages/python/fix-path.inc
new file mode 100644
index 0000000000..0738c59ada
--- /dev/null
+++ b/packages/python/fix-path.inc
@@ -0,0 +1,22 @@
+do_install_append() {
+        for i in `find ${D} -name "*.py"` ; do \
+            sed -i -e s:${D}::g $i
+        done
+
+        for i in `find ${D} -name "*.la"` ; do \
+            sed -i -e s:${STAGING_LIBDIR}:${libdir}:g $i
+        done
+        
+        if test -e ${D}${bindir} ; then
+            for i in ${D}${bindir}/* ; do \
+                sed -i -e s:${STAGING_BINDIR_NATIVE}:${bindir}:g $i
+            done
+        fi
+
+        if test -e ${D}${sbindir} ; then
+            for i in ${D}${sbindir}/* ; do \
+                sed -i -e s:${STAGING_BINDIR_NATIVE}:${bindir}:g $i
+            done
+        fi
+}
+
diff --git a/packages/python/python-pygtk2_2.10.3.bb b/packages/python/python-pygtk2_2.10.3.bb
index a71765dfbc..d3811ddddd 100644
--- a/packages/python/python-pygtk2_2.10.3.bb
+++ b/packages/python/python-pygtk2_2.10.3.bb
@@ -5,7 +5,7 @@ DEPENDS = "gtk+ libglade python-pycairo python-pygobject"
 RDEPENDS = "python-shell"
 SRCNAME = "pygtk"
 LICENSE = "LGPL"
-PR = "ml3"
+PR = "ml4"
 
 SRC_URI = "ftp://ftp.gnome.org/pub/gnome/sources/pygtk/2.10/${SRCNAME}-${PV}.tar.bz2 \
            file://fix-gtkunixprint.patch;patch=1 \
@@ -21,6 +21,8 @@ do_configure_prepend() {
 	install -m 0644 ${WORKDIR}/acinclude.m4 ${S}/
 }
 
+require fix-path.inc
+
 FILES_${PN}-dbg += "${libdir}/python2.4/site-packages/gtk-2.0/*/.debug"
 FILES_${PN}-dbg += "${libdir}/python2.4/site-packages/gtk-2.0/.debug"
 
diff --git a/packages/python/python-pyqt4_4.0.bb b/packages/python/python-pyqt4_4.2.bb
index 64a9a71f68..64a9a71f68 100644
--- a/packages/python/python-pyqt4_4.0.bb
+++ b/packages/python/python-pyqt4_4.2.bb
diff --git a/packages/vera-fonts/qpf-bitstream-vera-sans-mono_1.10.bb b/packages/qpf-fonts/qpf-bitstream-vera-sans-mono_1.10.bb
index 10d2d4acdd..10d2d4acdd 100644
--- a/packages/vera-fonts/qpf-bitstream-vera-sans-mono_1.10.bb
+++ b/packages/qpf-fonts/qpf-bitstream-vera-sans-mono_1.10.bb
diff --git a/packages/vera-fonts/qpf-bitstream-vera_1.10.bb b/packages/qpf-fonts/qpf-bitstream-vera_1.10.bb
index 86f2ef9446..86f2ef9446 100644
--- a/packages/vera-fonts/qpf-bitstream-vera_1.10.bb
+++ b/packages/qpf-fonts/qpf-bitstream-vera_1.10.bb
diff --git a/packages/qt/qt4-x11-free_4.3.0.bb b/packages/qt/qt4-x11-free_4.3.0.bb
index 4ff41fa8fd..4b69cc08ca 100644
--- a/packages/qt/qt4-x11-free_4.3.0.bb
+++ b/packages/qt/qt4-x11-free_4.3.0.bb
@@ -3,10 +3,10 @@ PRIORITY = "optional"
 HOMEPAGE = "http://www.trolltech.com"
 LICENSE = "GPL QPL"
 DEPENDS = "uicmoc4-native qmake2-native freetype jpeg virtual/libx11 xft libxext libxrender libxrandr libxcursor dbus"
-RDEPENDS_${PN} = "${QTPACKAGES}"
+RDEPENDS_${PN} = "${QT-NONDEV-PACKAGES}"
 PROVIDES = "qt4x11"
 
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz \
            file://0001-cross-compile.patch;patch=1 \
@@ -36,9 +36,9 @@ QT_CONFIG_FLAGS = "-release -shared -qt-zlib -system-libjpeg -no-nas-sound -no-s
                    -no-tablet -no-xkb -no-nis -no-cups -no-opengl \
                    -no-sse -no-sse2 -no-mmx -no-3dnow \
                    -no-sql-ibase -no-sql-mysql -no-sql-odbc -no-sql-psql -no-sql-sqlite -no-sql-sqlite2 \
-		   -qdbus \
+                   -qdbus \
                    -verbose -stl -no-accessibility \
-		   -pch -no-glib"
+                   -pch -no-glib"
 
 EXTRA_ENV = 'QMAKE="${STAGING_BINDIR_NATIVE}/qmake2 -after DEFINES+=QT_NO_XIM INCPATH+=${STAGING_INCDIR} \
              INCPATH+=${STAGING_INCDIR}/freetype2 LIBS+=-L${STAGING_LIBDIR}" \
@@ -117,16 +117,29 @@ do_install() {
 }
 
 QTPACKAGES = "libqtcore4 libqtcore4-dev libqtgui4 libqtgui4-dev libqtnetwork4 libqtnetwork4-dev \
-	     libqtsql4 libqtsql4-dev libqtsvg4 libqtsvg4-dev libqttest4 libqttest4-dev \
-	     libqtxml4 libqtxml4-dev \
+             libqtsql4 libqtsql4-dev libqtsvg4 libqtsvg4-dev libqttest4 libqttest4-dev \
+             libqtxml4 libqtxml4-dev \
              libqtdesigner4 libqtdesigner4-dev libqtdesignercomponents4 libqtdesignercomponents4-dev \
-	     libqt3support4 libqt3support4-dev \
-	     libqtassistantclient4 libqtassistantclient4-dev libqtscript4 libqtscript4-dev \
-	     libqtdbus4 libqtdbus4-dev \
+             libqt3support4 libqt3support4-dev \
+             libqtassistantclient4 libqtassistantclient4-dev libqtscript4 libqtscript4-dev \
+             libqtdbus4 libqtdbus4-dev \
              qt4-assistant qt4-common qt4-designer qt4-demos qt4-examples qt4-linguist \
-	     qt4-pixeltool qt4-dbus \
+             qt4-pixeltool qt4-dbus \
              qt4-plugins-accessible qt4-plugins-codecs qt4-plugins-designer qt4-plugins-imageformats qt4-plugins-sqldrivers \
-	     qt4-plugins-inputmethods qt4-plugins-iconengines"
+             qt4-plugins-inputmethods qt4-plugins-iconengines"
+
+QT-NONDEV-PACKAGES = "libqtcore4 libqtgui4 libqtnetwork4  \
+             libqtsql4 libqtsvg4 libqttest4 \
+             libqtxml4 \
+             libqtdesigner4 libqtdesignercomponents4 \
+             libqt3support4 \
+             libqtassistantclient4 libqtscript4 \
+             libqtdbus4 \
+             qt4-assistant qt4-common qt4-designer qt4-demos qt4-examples qt4-linguist \
+             qt4-pixeltool qt4-dbus \
+             qt4-plugins-accessible qt4-plugins-codecs qt4-plugins-designer qt4-plugins-imageformats qt4-plugins-sqldrivers \
+             qt4-plugins-inputmethods qt4-plugins-iconengines"
+
 PACKAGES += "${QTPACKAGES}"
 
 ALLOW_EMPTY = "1"
@@ -154,10 +167,10 @@ FILES_libqt3support4               = "${libdir}/libQt3Support.so.*"
 FILES_libqt3support4-dev           = "${libdir}/libQt3Support.so"
 FILES_libqtassistantclient4        = "${libdir}/libQtAssistantClient.so.*"
 FILES_libqtassistantclient4-dev    = "${libdir}/libQtAssistantClient.so"
-FILES_libqtscript4	           = "${libdir}/libQtScript.so.*"
-FILES_libqtscript4-dev	           = "${libdir}/libQtScript.so"
-FILES_libqtdbus4	           = "${libdir}/libQtDBus.so.*"
-FILES_libqtdbus4-dev	           = "${libdir}/libQtDBus.so"
+FILES_libqtscript4                 = "${libdir}/libQtScript.so.*"
+FILES_libqtscript4-dev             = "${libdir}/libQtScript.so"
+FILES_libqtdbus4                   = "${libdir}/libQtDBus.so.*"
+FILES_libqtdbus4-dev               = "${libdir}/libQtDBus.so"
 
 FILES_qt4-plugins-accessible   = "${libdir}/plugins/accessible/*.so"
 FILES_qt4-plugins-codecs       = "${libdir}/plugins/codecs/*.so"
@@ -170,8 +183,8 @@ FILES_qt4-plugins-iconengines  = "${libdir}/plugins/iconengines/*.so"
 FILES_qt4-assistant            = "${bindir}/*assistant*"
 FILES_qt4-designer             = "${bindir}/*designer*"
 FILES_qt4-linguist             = "${bindir}/*linguist* ${bindir}/lrelease ${bindir}/lupdate ${bindir}/qm2ts"
-FILES_qt4-pixeltool	       = "${bindir}/pixeltool"
-FILES_qt4-dbus		       = "${bindir}/qdbus ${bindir}/qdbusxml2cpp ${bindir}/qdbuscpp2xml ${bindir}/qdbusviewer"
+FILES_qt4-pixeltool            = "${bindir}/pixeltool"
+FILES_qt4-dbus                 = "${bindir}/qdbus ${bindir}/qdbusxml2cpp ${bindir}/qdbuscpp2xml ${bindir}/qdbusviewer"
 
 FILES_qt4-common               = "${bindir}/qtconfig"
 FILES_qt4-examples             = "${bindir}/qt4-examples/*"
diff --git a/packages/rfakeap/rfakeap_0.2.bb b/packages/rfakeap/rfakeap_0.2.bb
index 1854e20286..702399e0f5 100644
--- a/packages/rfakeap/rfakeap_0.2.bb
+++ b/packages/rfakeap/rfakeap_0.2.bb
@@ -2,7 +2,6 @@ SECTION = "console/network"
 DESCRIPTION = "Raw Fake AP"
 HOMEPAGE = "http://rfakeap.tuxfamily.org/"
 LICENSE = "GPLv2"
-MAINTAINER = "Zero_Chaos <sidhayn@hotmail.com>"
 DEPENDS = "libpcap"
 PV="0.2"
 PR="r1"
diff --git a/packages/rp-pppoe/rp-pppoe-3.8/top-autoconf.patch b/packages/rp-pppoe/rp-pppoe-3.8/top-autoconf.patch
new file mode 100644
index 0000000000..e3b0482984
--- /dev/null
+++ b/packages/rp-pppoe/rp-pppoe-3.8/top-autoconf.patch
@@ -0,0 +1,25 @@
+The autoconf stuff is all in a subdirectory, which is rather annoying
+as OE expects patches to be applied and autoconf stuff to be done in
+S. This adds enough autoconf at the top level to allow it to be
+called there - all it does is run a sub autoconf stuff in the src
+directory.
+
+Index: rp-pppoe-3.8/Makefile.am
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ rp-pppoe-3.8/Makefile.am	2007-06-08 15:58:16.000000000 +1000
+@@ -0,0 +1,5 @@
++PACKAGE = rp-pppoe
++VERSION = 3.8
++
++dnl AM_CFLAGS = -Wall -DDEBUG
++SUBDIRS = src
+Index: rp-pppoe-3.8/configure.in
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ rp-pppoe-3.8/configure.in	2007-06-08 15:58:16.000000000 +1000
+@@ -0,0 +1,4 @@
++AC_INIT(src/pppoe.c)
++AM_INIT_AUTOMAKE([rp-pppoe], [3.8])
++AC_CONFIG_SUBDIRS(src)
++AC_OUTPUT(Makefile)
diff --git a/packages/rp-pppoe/rp-pppoe-3.8/update-config.patch b/packages/rp-pppoe/rp-pppoe-3.8/update-config.patch
new file mode 100644
index 0000000000..5642e3cfee
--- /dev/null
+++ b/packages/rp-pppoe/rp-pppoe-3.8/update-config.patch
@@ -0,0 +1,30 @@
+Set the timeout to 0 since we don't want pppoe to try reconnecting,
+we want whatever is calling it to reconnect. Lots of odd things
+happen when you have pppoe retrying itself.
+
+The path for the plugin is wrong, it's now part of ppp and is in a
+ppp's plugin lib directory. If no path is specified then that's where
+ppp looks, so that's what we do here.
+
+Index: rp-pppoe-3.8/configs/pppoe.conf
+===================================================================
+--- rp-pppoe-3.8.orig/configs/pppoe.conf	2006-04-03 00:29:41.000000000 +1000
++++ rp-pppoe-3.8/configs/pppoe.conf	2007-06-08 16:02:47.000000000 +1000
+@@ -66,7 +66,7 @@
+ # to connect forever after pppoe-start is called.  Otherwise, it will
+ # give out after CONNECT_TIMEOUT seconds and will not attempt to
+ # connect again, making it impossible to reach.
+-CONNECT_TIMEOUT=30
++CONNECT_TIMEOUT=0
+ 
+ # How often in seconds pppoe-start polls to check if link is up
+ CONNECT_POLL=2
+@@ -115,7 +115,7 @@
+ FIREWALL=NONE
+ 
+ # Linux kernel-mode plugin for pppd.  If you want to try the kernel-mode
+-# plugin, use LINUX_PLUGIN=/etc/ppp/plugins/rp-pppoe.so
++# plugin, use LINUX_PLUGIN=rp-pppoe.so
+ LINUX_PLUGIN=
+ 
+ # Any extra arguments to pass to pppoe.  Normally, use a blank string
diff --git a/packages/rp-pppoe/rp-pppoe_3.8.bb b/packages/rp-pppoe/rp-pppoe_3.8.bb
index 8743838909..6b2084ea4a 100644
--- a/packages/rp-pppoe/rp-pppoe_3.8.bb
+++ b/packages/rp-pppoe/rp-pppoe_3.8.bb
@@ -5,25 +5,21 @@ LICENSE = "GPLv2"
 RDEPENDS_${PN} = "ppp"
 RDEPENDS_${PN}-server = "${PN}"
 RRECOMMENDS_${PN} = "ppp-oe"
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "http://www.roaringpenguin.com/files/download/${P}.tar.gz \
-           file://configure_in_cross.patch;patch=1;pnum=2 \
-           file://pppoe-src-restrictions.patch;patch=1;pnum=2 \
+           file://top-autoconf.patch;patch=1 \
+           file://configure_in_cross.patch;patch=1 \
+           file://pppoe-src-restrictions.patch;patch=1 \
+           file://update-config.patch;patch=1 \
            file://pppoe-server.default \
            file://pppoe-server.init"
 
-S = "${WORKDIR}/${P}/src"
+S = "${WORKDIR}/${P}"
 
 inherit autotools update-rc.d
 
 do_install() {
-        # Set timeout to 0. Fixes lots of reconnect issues
-        # No need for full path to the PPPoE plugin, and it's in a different 
-        # Can't patch this in because it's outside of what we have {S} set to.
-        sed -i -e 's,\(CONNECT_TIMEOUT=\)30,\10,g' \
-               -e 's,\(LINUX_PLUGIN=\)/etc/ppp/plugins/rp-pppoe.so,\1rp-pppoe.so,g' \
-               ${S}/../configs/pppoe.conf
         # Install init script and default settings
         install -m 0755 -d ${D}${sysconfdir}/default ${D}${sysconfdir}/init.d
         install -m 0644 ${WORKDIR}/pppoe-server.default ${D}${sysconfdir}/default/pppoe-server
diff --git a/packages/s3c2410-utils/s3c2410-boot-usb-native_20060807.bb b/packages/s3c2410-utils/s3c2410-boot-usb-native_20060807.bb
index ee8534dc01..f53d175a80 100644
--- a/packages/s3c2410-utils/s3c2410-boot-usb-native_20060807.bb
+++ b/packages/s3c2410-utils/s3c2410-boot-usb-native_20060807.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "Boots a S3C2410 device with a user supplied kernel zImage"
 DEPENDS = "libusb-native"
 SECTION = "devel"
 AUTHOR = "Harald Welte"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 PR = "r0"
 
diff --git a/packages/s3c2410-utils/sjf2410-linux-native_20060807.bb b/packages/s3c2410-utils/sjf2410-linux-native_20060807.bb
index 53b2d0c8e0..0ec6642dc2 100644
--- a/packages/s3c2410-utils/sjf2410-linux-native_20060807.bb
+++ b/packages/s3c2410-utils/sjf2410-linux-native_20060807.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Jtag utility to interface w/ a S3C2410 device"
 SECTION = "devel"
 AUTHOR = "Harald Welte"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 PR = "r1"
 
diff --git a/packages/starling/starling_0.2.bb b/packages/starling/starling_0.2.bb
new file mode 100644
index 0000000000..9b389c53cc
--- /dev/null
+++ b/packages/starling/starling_0.2.bb
@@ -0,0 +1,20 @@
+DESCRIPTION = "Starling audio player for GPE"
+SECTION = "gpe/multimedia"
+PRIORITY = "optional"
+LICENSE = "GPL"
+DEPENDS = "gtk+ libgpewidget gstreamer gst-plugins-good gst-plugins-bad esound sqlite3 libsoup"
+RDEPENDS = "pulseaudio-bin \
+        gst-plugin-audioconvert \
+        gst-plugin-esd \
+        gst-plugin-typefindfunctions \
+        gst-plugin-decodebin \
+        gst-plugin-volume"
+RRECOMMENDS = "gst-plugin-mad \
+        gst-plugin-modplug \
+        gst-plugin-ivorbis \
+        gst-plugin-tcp"
+
+GPE_TARBALL_SUFFIX = "bz2"
+
+inherit gpe autotools
+
diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb
index 2b02080c83..d89d781202 100644
--- a/packages/tasks/task-base.bb
+++ b/packages/tasks/task-base.bb
@@ -1,8 +1,9 @@
 DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
 PR = "r36"
 
+DEPENDS = "task-boot"
 PROVIDES = "${PACKAGES}"
-PACKAGES = 'task-boot \
+PACKAGES = ' \
             task-base \
             task-base-extended \
             task-distro-base \
@@ -43,27 +44,11 @@ PACKAGE_ARCH = "all"
 # packages which content depend on MACHINE_FEATURES need to be MACHINE_ARCH
 #
 PACKAGE_ARCH_task-base = "${MACHINE_ARCH}"
-PACKAGE_ARCH_task-boot = "${MACHINE_ARCH}"
 PACKAGE_ARCH_task-machine-base = "${MACHINE_ARCH}"
 PACKAGE_ARCH_task-base-apm = "${MACHINE_ARCH}"
 PACKAGE_ARCH_task-base-pcmcia = "${MACHINE_ARCH}"
 
 #
-# udev, devfsd, mdev (from busybox) or none
-#
-DISTRO_DEV_MANAGER ?= "${@base_contains("MACHINE_FEATURES", "kernel26",  "udev","",d)} "
-
-#
-# sysvinit, upstart
-#
-DISTRO_INIT_MANAGER ?= "sysvinit sysvinit-pidof"
-
-#
-# tinylogin, getty
-#
-DISTRO_LOGIN_MANAGER ?= "tinylogin"
-
-#
 # linux-hotplug or none
 #
 HOTPLUG ?= "${@base_contains("MACHINE_FEATURES", "kernel24",  "linux-hotplug","",d)} "
@@ -158,26 +143,6 @@ RRECOMMENDS_task-distro-base = "${DISTRO_EXTRA_RRECOMMENDS}"
 RDEPENDS_task-machine-base = "${MACHINE_EXTRA_RDEPENDS}"
 RRECOMMENDS_task-machine-base = "${MACHINE_EXTRA_RRECOMMENDS}"
 
-#
-# minimal set of packages - needed to boot
-#
-RDEPENDS_task-boot = "\
-    kernel \
-    base-files \
-    base-passwd \
-    busybox \
-    initscripts \
-    modutils-initscripts \
-    netbase \
-    update-alternatives \
-    ${DISTRO_DEV_MANAGER} \
-    ${DISTRO_INIT_MANAGER} \
-    ${DISTRO_LOGIN_MANAGER} \
-    ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS}"
-
-RRECOMMENDS_task-boot = "\
-    ${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS}"
-
 RDEPENDS_task-base-kernel24 = "\
     modutils-depmod"
 
diff --git a/packages/tasks/task-boot.bb b/packages/tasks/task-boot.bb
new file mode 100644
index 0000000000..95eb55b748
--- /dev/null
+++ b/packages/tasks/task-boot.bb
@@ -0,0 +1,53 @@
+DESCRIPTION = "Basic task to get a device booting"
+PR = "r35"
+
+PROVIDES = "${PACKAGES}"
+PACKAGES = 'task-boot'
+
+ALLOW_EMPTY = "1"
+
+# packages which content depend on MACHINE_FEATURES need to be MACHINE_ARCH
+#
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+#
+# udev, devfsd, mdev (from busybox) or none
+#
+DISTRO_DEV_MANAGER ?= "${@base_contains("MACHINE_FEATURES", "kernel26",  "udev","",d)} "
+
+#
+# sysvinit, upstart
+#
+DISTRO_INIT_MANAGER ?= "sysvinit sysvinit-pidof"
+
+#
+# tinylogin, getty
+#
+DISTRO_LOGIN_MANAGER ?= "tinylogin"
+
+#
+# those ones can be set in machine config to supply packages needed to get machine booting
+#
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= ""
+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= ""
+
+#
+# minimal set of packages - needed to boot
+#
+RDEPENDS_task-boot = "\
+    kernel \
+    base-files \
+    base-passwd \
+    busybox \
+    initscripts \
+    modutils-initscripts \
+    netbase \
+    update-alternatives \
+    ${DISTRO_DEV_MANAGER} \
+    ${DISTRO_INIT_MANAGER} \
+    ${DISTRO_LOGIN_MANAGER} \
+    ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS}"
+
+RRECOMMENDS_task-boot = "\
+    ${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS}"
+
diff --git a/packages/tasks/task-hentges-base.bb b/packages/tasks/task-hentges-base.bb
index 894197f381..89b39aeba9 100644
--- a/packages/tasks/task-hentges-base.bb
+++ b/packages/tasks/task-hentges-base.bb
@@ -7,7 +7,6 @@
 # Date: 20070516 (YMD)
 
 DESCRIPTION = "task-hentges-base"
-MAINTAINER = "Matthias 'CoreDump' Hentges <oe@hentges.net>"
 HOMEPAGE = "http://www.hentges.net/misc/openzaurus/index.shtml"
 LICENSE = "MIT"
 
diff --git a/packages/tasks/task-hentges-x11.bb b/packages/tasks/task-hentges-x11.bb
index 87c89d6a4c..db658e9014 100644
--- a/packages/tasks/task-hentges-x11.bb
+++ b/packages/tasks/task-hentges-x11.bb
@@ -8,7 +8,6 @@
 # Date: 20070522 (YMD)
 
 DESCRIPTION = "task-hentges-x11"
-MAINTAINER = "Matthias 'CoreDump' Hentges <oe@hentges.net>"
 HOMEPAGE = "http://www.hentges.net/misc/openzaurus/index.shtml"
 LICENSE = "MIT"
 
diff --git a/packages/vera-fonts/ttf-bitstream-vera_1.10.bb b/packages/ttf-fonts/ttf-bitstream-vera_1.10.bb
index 871bc1d37c..871bc1d37c 100644
--- a/packages/vera-fonts/ttf-bitstream-vera_1.10.bb
+++ b/packages/ttf-fonts/ttf-bitstream-vera_1.10.bb
diff --git a/packages/ttyrec/ttyrec_1.0.8.bb b/packages/ttyrec/ttyrec_1.0.8.bb
index 324751b4ba..bf58f245cb 100644
--- a/packages/ttyrec/ttyrec_1.0.8.bb
+++ b/packages/ttyrec/ttyrec_1.0.8.bb
@@ -8,7 +8,6 @@
 # Date: 20070403 (YMD)
 
 DESCRIPTION = "ttyrec is a tty recorder. Recorded data can be played back with the included ttyplay command."
-MAINTAINER = "Matthias 'CoreDump' Hentges <oe@hentges.net>"
 HOMEPAGE = "http://0xcc.net/ttyrec/index.html.en"
 
 ######################################################################################
diff --git a/packages/usb-gadget-mode/usb-gadget-mode.bb b/packages/usb-gadget-mode/usb-gadget-mode.bb
index 3109a4d92e..f27be3e427 100644
--- a/packages/usb-gadget-mode/usb-gadget-mode.bb
+++ b/packages/usb-gadget-mode/usb-gadget-mode.bb
@@ -8,8 +8,6 @@
 # Date: 20070606 (YMD)
 
 DESCRIPTION = "Manage the default USB gadget mode"
-MAINTAINER = "Matthias 'CoreDump' Hentges <oe@hentges.net>"
-HOMEPAGE = "<homepage>"
 LICENSE = "GPL"
 
 ######################################################################################
@@ -19,7 +17,7 @@ PR = "r2"
 
 ######################################################################################
 
-PACKAGE_ARCH = "${MACHINE}"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 ######################################################################################
 
diff --git a/packages/vera-fonts/.mtn2git_empty b/packages/vera-fonts/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/vera-fonts/.mtn2git_empty
+++ /dev/null
diff --git a/packages/webcam-server/webcam-server_0.50.bb b/packages/webcam-server/webcam-server_0.50.bb
index 737ef75977..df7873c382 100644
--- a/packages/webcam-server/webcam-server_0.50.bb
+++ b/packages/webcam-server/webcam-server_0.50.bb
@@ -8,7 +8,6 @@
 # Date: 20070317 (YMD)
 
 DESCRIPTION = "webcam_server is a program that allows others to view your webcam from a web browser."
-MAINTAINER = "Matthias 'CoreDump' Hentges <oe@hentges.net>"
 HOMEPAGE = "http://webcamserver.sourceforge.net/"
 LICENSE = "GPL"
 
diff --git a/packages/yeaphone/yeaphone_0.1.bb b/packages/yeaphone/yeaphone_0.1.bb
index 2612b37e9a..67b651ae71 100644
--- a/packages/yeaphone/yeaphone_0.1.bb
+++ b/packages/yeaphone/yeaphone_0.1.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "A VoIP SIP phone for the Yealink USB handset"
 HOMEPAGE = "http://www.devbase.at/voip/"
-MAINTAINER = "Thomas Reitmayr <treitmayr@yahoo.com>"
 LICENSE = "GPLv2"
 PRIORITY = "optional"
 DEPENDS = "liblinphone"