merge of 15102cf542cc997f3e0ddb34d8f69395cdf724c0

     and 26c9a4c6e4fd286acde8c53cec3cd492e7bbd3cf

86 files changed, 166670 insertions, 483 deletions

diff --git a/packages/abiword/abiword_2.3.99.bb b/packages/abiword/abiword_2.3.99.bb
index 76b569db29..9a83ff3d5b 100644
--- a/packages/abiword/abiword_2.3.99.bb
+++ b/packages/abiword/abiword_2.3.99.bb
@@ -6,28 +6,28 @@ LICENSE="GPLv2"
 DEPENDS     = "cdump-native libgsf libgnomeprint libgnomeprintui libglade libfribidi enchant jpeg libpng perl glibc libxml2"
 RDEPENDS    = "enchant glibc-gconv-ibm850 glibc-gconv-cp1252 \
                glibc-gconv-iso8859-15 glibc-gconv-iso8859-1"
-PR="r4"
+PR="r5"
 
 SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz \
 	file://cdump-hack.patch;patch=1"
 S = "${WORKDIR}/abiword-${PV}/abi"
 
 FILES_${PN} += " ${datadir}/icons/* \
-${datadir}/AbiSuite-2.2/AbiWord/glade \
-${datadir}/AbiSuite-2.2/AbiWord/scripts \
-${datadir}/AbiSuite-2.2/AbiWord/system.profile-en \
-${datadir}/AbiSuite-2.2/AbiWord/system.profile-en_GB \
-#${datadir}/AbiSuite-2.2/templates/A4.awt \
-#${datadir}/AbiSuite-2.2/templates/US-Letter.awt \
-${datadir}/AbiSuite-2.2/templates/normal.awt \
-${datadir}/AbiSuite-2.2/templates/normal.awt-en_GB \
-${datadir}/AbiSuite-2.2/templates/Employee-Directory.awt \
-${datadir}/AbiSuite-2.2/templates/Business-Report.awt \
-${datadir}/AbiSuite-2.2/templates/Fax-Coversheet.awt \
-${datadir}/AbiSuite-2.2/templates/Resume.awt \
-${datadir}/AbiSuite-2.2/templates/Two-Columns.awt \
-${datadir}/AbiSuite-2.2/templates/Memo.awt \
-${datadir}/AbiSuite-2.2/templates/Press-Release.awt "
+${datadir}/AbiSuite-2.4/AbiWord/glade \
+${datadir}/AbiSuite-2.4/AbiWord/scripts \
+${datadir}/AbiSuite-2.4/AbiWord/system.profile-en \
+${datadir}/AbiSuite-2.4/AbiWord/system.profile-en_GB \
+#${datadir}/AbiSuite-2.4/templates/A4.awt \
+#${datadir}/AbiSuite-2.4/templates/US-Letter.awt \
+${datadir}/AbiSuite-2.4/templates/normal.awt \
+${datadir}/AbiSuite-2.4/templates/normal.awt-en_GB \
+${datadir}/AbiSuite-2.4/templates/Employee-Directory.awt \
+${datadir}/AbiSuite-2.4/templates/Business-Report.awt \
+${datadir}/AbiSuite-2.4/templates/Fax-Coversheet.awt \
+${datadir}/AbiSuite-2.4/templates/Resume.awt \
+${datadir}/AbiSuite-2.4/templates/Two-Columns.awt \
+${datadir}/AbiSuite-2.4/templates/Memo.awt \
+${datadir}/AbiSuite-2.4/templates/Press-Release.awt "
 
 inherit autotools
 
diff --git a/packages/bluez/bluez-utils-dbus/hcid-alignment-fix.patch b/packages/bluez/bluez-utils-dbus/hcid-alignment-fix.patch
new file mode 100644
index 0000000000..276281c14e
--- /dev/null
+++ b/packages/bluez/bluez-utils-dbus/hcid-alignment-fix.patch
@@ -0,0 +1,42 @@
+--- bluez-utils-2.20/hcid/dbus.c.orig	2005-09-21 11:27:26 +0200
++++ bluez-utils-2.20/hcid/dbus.c	2005-09-21 11:27:35 +0200
+@@ -120,6 +121,7 @@
+ 	DBusMessage *message;
+ #ifdef HAVE_DBUS_MESSAGE_ITER_GET_BASIC
+ 	uint8_t *addr = (uint8_t *) &ci->bdaddr;
++	uint32_t ci_out = ci->out;
+ #else
+ 	DBusMessageIter iter;
+ #endif
+@@ -138,7 +140,7 @@
+ 	bacpy(&req->bda, &ci->bdaddr);
+ 
+ #ifdef HAVE_DBUS_MESSAGE_ITER_GET_BASIC
+-	dbus_message_append_args(message, DBUS_TYPE_BOOLEAN, &ci->out,
++	dbus_message_append_args(message, DBUS_TYPE_BOOLEAN, &ci_out,
+ 			DBUS_TYPE_ARRAY, DBUS_TYPE_BYTE,
+ 			&addr, sizeof(bdaddr_t), DBUS_TYPE_INVALID);
+ #else
+@@ -261,6 +263,8 @@
+ 	DBusMessage *message;
+ #ifndef HAVE_DBUS_MESSAGE_ITER_GET_BASIC
+ 	DBusMessageIter iter;
++#else
++	int32_t tmp_rssi = rssi;
+ #endif
+ 	char *local_addr, *peer_addr;
+ 	bdaddr_t tmp;
+@@ -276,11 +280,12 @@
+ 	}
+ 
+ #ifdef HAVE_DBUS_MESSAGE_ITER_GET_BASIC
++
+ 	dbus_message_append_args(message,
+ 					DBUS_TYPE_STRING, &local_addr,
+ 					DBUS_TYPE_STRING, &peer_addr,
+ 					DBUS_TYPE_UINT32, &class,
+-					DBUS_TYPE_INT32, &rssi,
++					DBUS_TYPE_INT32, &tmp_rssi,
+ 					DBUS_TYPE_INVALID);
+ #else
+ 	dbus_message_append_iter_init(message, &iter);
diff --git a/packages/bluez/bluez-utils-dbus_2.20.bb b/packages/bluez/bluez-utils-dbus_2.20.bb
index e54ff67085..3248b652f0 100644
--- a/packages/bluez/bluez-utils-dbus_2.20.bb
+++ b/packages/bluez/bluez-utils-dbus_2.20.bb
@@ -1,5 +1,6 @@
 include bluez-utils.inc
 DEPENDS += "dbus"
-SRC_URI += "file://dbus.patch;patch=1 file://smash.patch;patch=1"
+SRC_URI += "file://smash.patch;patch=1 \
+	    file://hcid-alignment-fix.patch;patch=1"
 EXTRA_OECONF += "--with-dbus"
 
diff --git a/packages/bluez/bluez-utils.inc b/packages/bluez/bluez-utils.inc
index b5a5e14970..10f70d384c 100644
--- a/packages/bluez/bluez-utils.inc
+++ b/packages/bluez/bluez-utils.inc
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 DEPENDS = "bluez-libs-${PV} pcmcia-cs"
 RPROVIDES_${PN} = "bluez-pan bluez-sdp bluez-utils"
 LICENSE = "GPL"
-PR = "r6"
+PR = "r7"
 
 SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \
 	file://base.patch;patch=1 \
diff --git a/packages/gnome/gnome-vfs-dbus/gssapi.patch b/packages/gnome/gnome-vfs-dbus/gssapi.patch
new file mode 100644
index 0000000000..a4fcd605f2
--- /dev/null
+++ b/packages/gnome/gnome-vfs-dbus/gssapi.patch
@@ -0,0 +1,18 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- gnome-vfs-dbus-2.8.4.4/configure.in~gssapi
++++ gnome-vfs-dbus-2.8.4.4/configure.in
+@@ -456,6 +456,10 @@
+    ])
+    LIBS="$saved_LIBS" 
+    CPPFLAGS="$saved_CPPFLAGS" 
++   if test "x$have_gssapi" != "xyes"; then
++     GSSAPI_LIBS=
++     GSSAPI_CFLAGS=
++   fi
+ fi   
+ AC_SUBST(GSSAPI_LIBS)
+ AC_SUBST(GSSAPI_CFLAGS)
diff --git a/packages/gnome/gnome-vfs-dbus_2.8.4.4.bb b/packages/gnome/gnome-vfs-dbus_2.8.4.4.bb
index 045a281676..fbec93c02b 100644
--- a/packages/gnome/gnome-vfs-dbus_2.8.4.4.bb
+++ b/packages/gnome/gnome-vfs-dbus_2.8.4.4.bb
@@ -11,6 +11,7 @@ RRECOMMENDS = "gnome-vfs-plugin-file shared-mime-info"
 
 
 SRC_URI = "http://ftp.imendio.com/pub/extra/${PN}/${PN}-${PV}.tar.gz \
+           file://gssapi.patch;patch=1;pnum=1 \
            file://gconftool-lossage.patch;patch=1;pnum=1"
 
 EXTRA_OECONF = "--with-ipc=dbus"
diff --git a/packages/gpe-contacts/gpe-contacts-hildon_0.42.bb b/packages/gpe-contacts/gpe-contacts-hildon_0.42.bb
new file mode 100644
index 0000000000..1762800b6d
--- /dev/null
+++ b/packages/gpe-contacts/gpe-contacts-hildon_0.42.bb
@@ -0,0 +1,12 @@
+include gpe-contacts.inc
+
+PR="r2"
+SRC_URI = "${GPE_MIRROR}/gpe-contacts-${PV}.tar.bz2"
+
+DEPENDS += "gtk+-2.6.4-1.osso7 libgpepimc-hildon libosso hildon-lgpl"
+RDEPENDS = ""
+
+EXTRA_OECONF += "--enable-hildon"
+
+S = "${WORKDIR}/gpe-contacts-${PV}"
+
diff --git a/packages/gpe-mini-browser/gpe-mini-browser-hildon_0.16.bb b/packages/gpe-mini-browser/gpe-mini-browser-hildon_0.16.bb
new file mode 100644
index 0000000000..14f5313bcc
--- /dev/null
+++ b/packages/gpe-mini-browser/gpe-mini-browser-hildon_0.16.bb
@@ -0,0 +1,51 @@
+PR = "r0"
+
+SRC_URI      = "${GPE_MIRROR}/gpe-mini-browser-${PV}.tar.gz"
+DESCRIPTION  = "A lightweight webbrowser for the GPE platform (Hildon UI)"
+LICENSE      = "GPL"
+DEPENDS      = "osb-nrcit libosso hildon-lgpl hildon-fm libgpewidget"
+EXTRA_OECONF = "--enable-hildon"
+
+S = "${WORKDIR}/gpe-mini-browser-${PV}"
+
+inherit autotools
+
+do_install() {
+		install -d ${D}/usr/share/applications/hildon
+		install -m 0644 ${S}/hildon/gpe-mini-browser.desktop ${D}/usr/share/applications/hildon/gpe-mini-browser.desktop
+		install -d ${D}/usr/share/pixmaps
+		install -m 0644 ${S}/gpe-mini-browser.png ${D}/usr/share/pixmaps/gpe-mini-browser.png
+		autotools_do_install
+}
+
+pkg_postinst_${PN}-doc () {
+        #!/bin/sh
+	if [ "x$D" != "x" ]; then
+        if [ -e /etc/gpe/gpe-help.conf ]; then
+                echo gpe-mini-browser= /usr/share/doc/gpe/gpe-mini-browser.html >> /etc/gpe/gpe-help.conf
+        else
+                 echo [Help] >> /etc/gpe/gpe-help.conf
+                 echo gpe-mini-browser= /usr/share/doc/gpe/gpe-mini-browser.html >> /etc/gpe/gpe-help.conf
+        fi
+        if [ -x /usr/bin/gpe-helpindex ]; then
+                echo generating help-index
+                gpe-helpindex
+        else
+                echo not generating index for gpe-mini-browser
+        fi
+	fi
+}
+
+pkg_postrm_${PN}-doc () {
+        #!/bin/sh
+        if [ -e /etc/gpe/gpe-help.conf ]; then
+                sed '/^\<gpe-mini-browser\>/d' /etc/gpe/gpe-help.conf > /tmp/gpe-help.conf
+                mv /tmp/gpe-help.conf /etc/gpe/gpe-help.conf
+        fi
+        if [ -x /usr/bin/gpe-helpindex ]; then
+                echo generating help-index
+                gpe-helpindex
+        else
+                echo not generating index for gpe-mini-browser
+        fi
+}
diff --git a/packages/gpe-themes/gpe-theme-clearlooks_0.2.bb b/packages/gpe-themes/gpe-theme-clearlooks_0.2.bb
index 93a7fcb597..571ad216e2 100644
--- a/packages/gpe-themes/gpe-theme-clearlooks_0.2.bb
+++ b/packages/gpe-themes/gpe-theme-clearlooks_0.2.bb
@@ -1,9 +1,10 @@
 DESCRIPTION =	"GTK+ clearlooks theme adjusted for GPE"
 MAINTAINER =	"Koen Kooi <koen@handhelds.org>"
+PR=		"r1"
 
 #it doesn't really depends on it, but it's nice to make OE build it
-DEPENDS =		"gtk-clearlooks-engine"
-RDEPENDS =		"gtk-clearlooks-engine"
+DEPENDS =		"gtk-engines"
+RDEPENDS =		"gtk-engine-clearlooks"
 
 FILES_${PN} =	"${datadir}/themes/"
 SRC_URI =		"http://dominion.kabel.utwente.nl/koen/pda/files/${P}.tar.gz"
diff --git a/packages/gpsd/gpsd.inc b/packages/gpsd/gpsd.inc
index 1fe8bf2646..830385c177 100644
--- a/packages/gpsd/gpsd.inc
+++ b/packages/gpsd/gpsd.inc
@@ -1,5 +1,5 @@
 DESCRIPTION = "A TCP/IP Daemon simplifying the communication with GPS devices"
-SECTION = "network"
+SECTION = "console/network"
 PRIORITY = "optional"
 LICENSE = "GPL"
 DEPENDS = "dbus-0.23.4 ncurses"
diff --git a/packages/linux/files/mipv6-1.1-v2.4.27.patch b/packages/linux/files/mipv6-1.1-v2.4.27.patch
new file mode 100644
index 0000000000..b8fb071d28
--- /dev/null
+++ b/packages/linux/files/mipv6-1.1-v2.4.27.patch
@@ -0,0 +1,19736 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- linux-2.4.27/Documentation/Configure.help~mipv6-1.1-v2.4.26
++++ linux-2.4.27/Documentation/Configure.help
+@@ -6308,6 +6308,57 @@
+ 
+   It is safe to say N here for now.
+ 
++IPv6: IPv6 over IPv6 Tunneling (EXPERIMENTAL)
++CONFIG_IPV6_TUNNEL
++  Experimental IP6-IP6 tunneling.  You must select this, i