merge of 5c865738b86de25a1967c923136fa0cc3cb3e3f7

     and d0c77a4c4d72b3036720b36aef3ddce852ccccda

100 files changed, 278 insertions, 116 deletions

diff --git a/packages/abiword/abiword_2.4.4.bb b/packages/abiword/abiword_2.4.4.bb
index 8b1ed52d8a..8f6c3adeb6 100644
--- a/packages/abiword/abiword_2.4.4.bb
+++ b/packages/abiword/abiword_2.4.4.bb
@@ -1,6 +1,6 @@
 DESCRIPTION ="AbiWord is free word processing program similar to Microsoft(r) Word""
 HOMEPAGE="http://www.abiword.org""
-MAINTAINER="Koen Kooi <koen@handhelds.org>"
+MAINTAINER="Koen Kooi <koen@linuxtogo.org>"
 LICENSE="GPLv2"
 
 DEPENDS     = "perl-native libgsf libgnomeprint libgnomeprintui libglade libfribidi enchant jpeg libpng perl glibc libxml2"
diff --git a/packages/abiword/abiword_2.4.5.bb b/packages/abiword/abiword_2.4.5.bb
index 8b1ed52d8a..8f6c3adeb6 100644
--- a/packages/abiword/abiword_2.4.5.bb
+++ b/packages/abiword/abiword_2.4.5.bb
@@ -1,6 +1,6 @@
 DESCRIPTION ="AbiWord is free word processing program similar to Microsoft(r) Word""
 HOMEPAGE="http://www.abiword.org""
-MAINTAINER="Koen Kooi <koen@handhelds.org>"
+MAINTAINER="Koen Kooi <koen@linuxtogo.org>"
 LICENSE="GPLv2"
 
 DEPENDS     = "perl-native libgsf libgnomeprint libgnomeprintui libglade libfribidi enchant jpeg libpng perl glibc libxml2"
diff --git a/packages/angstrom/angstrom-version.bb b/packages/angstrom/angstrom-version.bb
index f4322e06f1..34422da237 100644
--- a/packages/angstrom/angstrom-version.bb
+++ b/packages/angstrom/angstrom-version.bb
@@ -1,4 +1,4 @@
-MAINTAINER = "Koen Kooi <koen@handhelds.org>"
+MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 PV = ${DISTRO_VERSION}
 
 do_compile() {
diff --git a/packages/angstrom/task-angstrom.bb b/packages/angstrom/task-angstrom.bb
index 2f1aa23ee8..059e856028 100644
--- a/packages/angstrom/task-angstrom.bb
+++ b/packages/angstrom/task-angstrom.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Task packages for the Angstrom distribution"
-PR = "r15"
+PR = "r16"
 ALLOW_EMPTY = "1"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
@@ -71,7 +71,6 @@ RDEPENDS_angstrom-x11-base-depends := "\
 
 RDEPENDS_angstrom-gpe-task-base := "\
     matchbox \
-    dbus-glib \
     xcursor-transparent-theme \
     rxvt-unicode \
     matchbox-themes-gtk \
diff --git a/packages/cairo/cairo_1.2.0.bb b/packages/cairo/cairo_1.2.2.bb
index 700f425113..700f425113 100644
--- a/packages/cairo/cairo_1.2.0.bb
+++ b/packages/cairo/cairo_1.2.2.bb
diff --git a/packages/dia/dia_0.94+0.95pre3.bb b/packages/dia/dia_0.94+0.95pre3.bb
index 41366a335b..2905a598ce 100644
--- a/packages/dia/dia_0.94+0.95pre3.bb
+++ b/packages/dia/dia_0.94+0.95pre3.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Dia is a gtk+ based diagram creation program released under the GPL license."
 LICENSE = "GPL"
 DEPENDS = "libart-lgpl libpng cairo zlib gtk+ libxml2"
-MAINTAINER = "Koen Kooi <koen@handhelds.org>"
+MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 PR = "r1"
 
 inherit autotools pkgconfig
diff --git a/packages/familiar/familiar-version.bb b/packages/familiar/familiar-version.bb
index cd25f7f78e..20d94dbf1c 100644
--- a/packages/familiar/familiar-version.bb
+++ b/packages/familiar/familiar-version.bb
@@ -1,4 +1,4 @@
-MAINTAINER = "Koen Kooi <koen@handhelds.org>"
+MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 PV = ${DISTRO_VERSION}
 
 do_compile() {
diff --git a/packages/farsight/farsight_20060322.bb b/packages/farsight/farsight_0.1.5.bb
index 994569ac57..ee176dcacd 100644
--- a/packages/farsight/farsight_20060322.bb
+++ b/packages/farsight/farsight_0.1.5.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "FarSight is an audio/video conferencing framework specifically designed for Instant Messengers."
 HOMEPAGE = "http://farsight.sf.net"
-SRC_URI = "http://ewi546.ewi.utwente.nl/OE/source/${PN}_${PV}.tar.bz2"
-PR="r1"
+SRC_URI = "http://telepathy.freedesktop.org/releases/farsight/${P}.tar.gz"
 
 MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>"
 
@@ -9,7 +8,6 @@ DEPENDS = "glib-2.0 libxml2 zlib dbus libjingle gstreamer gst-plugins-base"
 
 inherit autotools pkgconfig
 
-S=  "${WORKDIR}/${PN}"
 EXTRA_OECONF = " \
 --disable-debug \
   --disable-gtk-doc \
diff --git a/packages/farsight/gst-plugins-farsight_20060322.bb b/packages/farsight/gst-plugins-farsight_0.10.1.bb
index 49f2d2a1f5..5fb44e07c2 100644
--- a/packages/farsight/gst-plugins-farsight_20060322.bb
+++ b/packages/farsight/gst-plugins-farsight_0.10.1.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "FarSight is an audio/video conferencing framework specifically designed for Instant Messengers."
 HOMEPAGE = "http://farsight.sf.net"
-SRC_URI = "http://ewi546.ewi.utwente.nl/OE/source/${PN}_${PV}.tar.bz2"
+SRC_URI = "http://telepathy.freedesktop.org/releases/gst-plugins-farsight/${P}.tar.gz"
 
 MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>"
 
@@ -8,7 +8,6 @@ DEPENDS = "glib-2.0 libxml2 zlib dbus libjingle gstreamer gst-plugins-base"
 
 inherit autotools pkgconfig
 
-S=  "${WORKDIR}/${PN}"
 EXTRA_OECONF = " \
 --disable-debug \
    --disable-jrtplib \
diff --git a/packages/fuse/fuse-module_2.4.2.bb b/packages/fuse/fuse-module_2.4.2.bb
index 8b8ca91eef..512f0453a1 100644
--- a/packages/fuse/fuse-module_2.4.2.bb
+++ b/packages/fuse/fuse-module_2.4.2.bb
@@ -1,6 +1,6 @@
 HOMEPAGE = "http://fuse.sf.net"
 DESCRIPTION = "With FUSE it is possible to implement a fully functional filesystem in a userspace program"
-MAINTAINER = "Koen Kooi <koen@handhelds.org>"
+MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 
 LICENSE = "GPL"
 
diff --git a/packages/fuse/fuse-module_2.5.3.bb b/packages/fuse/fuse-module_2.5.3.bb
index ae52ad0b03..94cd87c603 100644
--- a/packages/fuse/fuse-module_2.5.3.bb
+++ b/packages/fuse/fuse-module_2.5.3.bb
@@ -1,6 +1,6 @@
 HOMEPAGE = "http://fuse.sf.net"
 DESCRIPTION = "With FUSE it is possible to implement a fully functional filesystem in a userspace program"
-MAINTAINER = "Koen Kooi <koen@handhelds.org>"
+MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 
 LICENSE = "GPL"
 
diff --git a/packages/fuse/fuse_2.4.2.bb b/packages/fuse/fuse_2.4.2.bb
index 27abd3a898..a51c659153 100644
--- a/packages/fuse/fuse_2.4.2.bb
+++ b/packages/fuse/fuse_2.4.2.bb
@@ -1,6 +1,6 @@
 HOMEPAGE = "http://fuse.sf.net"
 DESCRIPTION = "With FUSE it is possible to implement a fully functional filesystem in a userspace program"
-MAINTAINER = "Koen Kooi <koen@handhelds.org>"
+MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 
 LICENSE_${PN} = "LGPL"
 
diff --git a/packages/fuse/fuse_2.5.3.bb b/packages/fuse/fuse_2.5.3.bb
index 229b38f2d7..8aa1f3578d 100644
--- a/packages/fuse/fuse_2.5.3.bb
+++ b/packages/fuse/fuse_2.5.3.bb
@@ -1,6 +1,6 @@
 HOMEPAGE = "http://fuse.sf.net"
 DESCRIPTION = "With FUSE it is possible to implement a fully functional filesystem in a userspace program"
-MAINTAINER = "Koen Kooi <koen@handhelds.org>"
+MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 
 LICENSE_${PN} = "LGPL"
 
diff --git a/packages/fuse/gmailfs_0.6.bb b/packages/fuse/gmailfs_0.6.bb
index fbac857024..169b42d1f3 100644
--- a/packages/fuse/gmailfs_0.6.bb
+++ b/packages/fuse/gmailfs_0.6.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "GmailFS provides a mountable Linux filesystem which uses your Gmail account as its storage medium."
 HOMEPAGE = "http://richard.jones.name/google-hacks/gmail-filesystem/gmail-filesystem.html"
-MAINTAINER = "koen Kooi <koen@handhelds.org>"
+MAINTAINER = "koen Kooi <koen@linuxtogo.org>"
 LICENSE = "GPL"
 
 DEPENDS = "fuse libgmail python-fuse"
diff --git a/packages/fuse/sshfs-fuse_1.3.bb b/packages/fuse/sshfs-fuse_1.3.bb
index d147d829b3..70c502be82 100644
--- a/packages/fuse/sshfs-fuse_1.3.bb
+++ b/