merge of '971d18af52c7881e09c9f5ffa43d9bf33216ce83'

     and 'cc76392ac5a7b1ccde5981fd2e02094b88a5240a'

17 files changed, 212 insertions, 15 deletions

diff --git a/packages/altboot/altboot_wip.bb b/packages/altboot/altboot_wip.bb
index 714a3d1d2b..2de4c812b9 100644
--- a/packages/altboot/altboot_wip.bb
+++ b/packages/altboot/altboot_wip.bb
@@ -9,7 +9,7 @@
 DESCRIPTION = "The altboot bootmanager"
 MAINTAINER = "Matthias 'CoreDump' Hentges <oe@hentges.net>"
 HOMEPAGE = "http://www.hentges.net/misc/openzaurus/index.shtml"
-LICENSE = "GPL"
+LICENSE = "GPL" 
 
 ######################################################################################
 
diff --git a/packages/angstrom/task-angstrom-x11.bb b/packages/angstrom/task-angstrom-x11.bb
index 95fb0cf0c6..36aa431d42 100644
--- a/packages/angstrom/task-angstrom-x11.bb
+++ b/packages/angstrom/task-angstrom-x11.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Task packages for the Angstrom distribution"
-PR = "r27"
+PR = "r28"
 ALLOW_EMPTY = "1"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
@@ -42,7 +42,6 @@ RDEPENDS_angstrom-gpe-task-base := "\
     gpe-autostarter \
     ${@base_contains("MACHINE_FEATURES", "touchscreen", "libgtkstylus", "",d)} \
     ${@base_contains("MACHINE_FEATURES", "keyboard", "", "libgtkinput",d)} \
-    ${@base_contains("MACHINE_FEATURES", "touchscreen", "detect-stylus", "",d)} \
     suspend-desktop \
     teleport \
     xauth \
diff --git a/packages/cups/cups_1.2.7.bb b/packages/cups/cups_1.2.7.bb
index acd735705c..22034f9a23 100644
--- a/packages/cups/cups_1.2.7.bb
+++ b/packages/cups/cups_1.2.7.bb
@@ -52,7 +52,15 @@ do_stage () {
 	oe_libinstall -C filter -so libcupsimage ${STAGING_LIBDIR}
 }
 
+FILES_${PN}-dbg += "${libdir}/cups/backend/.debug \
+                    ${libdir}/cups/cgi-bin/.debug \
+		    ${libdir}/cups/filter/.debug \
+		    ${libdir}/cups/monitor/.debug \
+		    ${libdir}/cups/notifier/.debug \
+		    ${libdir}/cups/daemon/.debug \
+		    "
 #package the html for the webgui inside the main packages (~1MB uncompressed)
+
 FILES_${PN} += "${datadir}/doc/cups/images \
 		${datadir}/doc/cups/*html \
 		${datadir}/doc/cups/*.css \
diff --git a/packages/gnome/gnome-vfs_2.16.3.bb b/packages/gnome/gnome-vfs_2.16.3.bb
index 0c6176428e..b1f634c0e9 100644
--- a/packages/gnome/gnome-vfs_2.16.3.bb
+++ b/packages/gnome/gnome-vfs_2.16.3.bb
@@ -17,7 +17,8 @@ EXTRA_OECONF = " \
 		 --disable-openssl \
 		 --enable-gnutls \
 		 --enable-avahi \
-		 "
+                 --with-samba-includes=${STAGING_INCDIR} \
+               "
 
 FILES_${PN} += " ${libdir}/vfs"
 FILES_${PN}-dev += " ${libdir}/gnome-vfs-2.0/include"
diff --git a/packages/gpe-session-scripts/gpe-session-scripts_0.67.bb b/packages/gpe-session-scripts/gpe-session-scripts_0.67.bb
index 85c6a2575a..583fe2f7e3 100644
--- a/packages/gpe-session-scripts/gpe-session-scripts_0.67.bb
+++ b/packages/gpe-session-scripts/gpe-session-scripts_0.67.bb
@@ -4,14 +4,14 @@ DESCRIPTION = "GPE session startup scripts"
 LICENSE = "GPL"
 SECTION = "gpe"
 PRIORITY = "optional"
-RDEPENDS_${PN} = "matchbox-panel (>= 0.9.2-r12) matchbox-desktop (>= 0.9.1-r1) matchbox-common (>= 0.9.1-r2) gpe-session-starter gpe-bluetooth xstroke xtscal gpe-question gpe-clock matchbox-applet-inputmanager xrandr xmodmap xdpyinfo xserver-common"
+RDEPENDS_${PN} = "matchbox-panel (>= 0.9.2-r12) matchbox-desktop (>= 0.9.1-r1) matchbox-common (>= 0.9.1-r2) gpe-session-starter xtscal gpe-question matchbox-applet-inputmanager xmodmap xdpyinfo xserver-common"
 # more rdepends: keylaunch ipaq-sleep apmd blueprobe
-DEPENDS = "matchbox-wm matchbox-panel gpe-bluetooth xstroke xtscal gpe-question matchbox-applet-inputmanager gpe-clock xrandr xmodmap xdpyinfo xserver-common"
+DEPENDS = "matchbox-wm matchbox-panel xtscal gpe-question matchbox-applet-inputmanager xmodmap xdpyinfo xserver-common"
 
 SRC_URI += "file://matchbox-session \
 	file://disable-composite.xsettings"
 
-PR = "r5"
+PR = "r6"
 
 #apply a patch to set the fontsize for bigdpi (200+) devices to 5
 SRC_URI_append_hx4700 = " file://highdpifontfix.patch;patch=1"
diff --git a/packages/gsm/libgsmd_svn.bb b/packages/gsm/libgsmd_svn.bb
index e43c19fc73..860adf3b0a 100644
--- a/packages/gsm/libgsmd_svn.bb
+++ b/packages/gsm/libgsmd_svn.bb
@@ -4,7 +4,7 @@ LICENSE = "GPL"
 SECTION = "libs/gsm"
 PROVIDES += "gsmd"
 PV = "0.0+svn${SRCDATE}"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http"
 S = "${WORKDIR}/gsm"
@@ -17,7 +17,7 @@ do_stage() {
 
 PACKAGES =+ "${PN}-tools gsmd"
 RDEPENDS_${PN} = "gsmd"
-FILES_${PN}-tools = "${bindir}"
+FILES_${PN}-tools = "${bindir}/*"
 FILES_gsmd = "${sbindir}/gsmd"
 
 PACKAGES_DYNAMIC = "libgsmd* gsmd"
diff --git a/packages/linux/linux-handhelds-2.6_2.6.19-hh11.bb b/packages/linux/linux-handhelds-2.6_2.6.19-hh11.bb
new file mode 100644
index 0000000000..ec5844bfb5
--- /dev/null
+++ b/packages/linux/linux-handhelds-2.6_2.6.19-hh11.bb
@@ -0,0 +1,11 @@
+SECTION = "kernel"
+DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices."
+LICENSE = "GPL"
+PR = "r1"
+
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \
+           file://defconfig"
+
+require linux-handhelds-2.6.inc
diff --git a/packages/linux/linux-handhelds-2.6_2.6.19-hh12.bb b/packages/linux/linux-handhelds-2.6_2.6.19-hh12.bb
new file mode 100644
index 0000000000..ec5844bfb5
--- /dev/null
+++ b/packages/linux/linux-handhelds-2.6_2.6.19-hh12.bb
@@ -0,0 +1,11 @@
+SECTION = "kernel"
+DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices."
+LICENSE = "GPL"
+PR = "r1"
+
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \
+           file://defconfig"
+
+require linux-handhelds-2.6.inc
diff --git a/packages/openmoko-apps/openmoko-messages_svn.bb b/packages/openmoko-apps/openmoko-messages_svn.bb
new file mode 100644
index 0000000000..d7a708b85c
--- /dev/null
+++ b/packages/openmoko-apps/openmoko-messages_svn.bb
@@ -0,0 +1,7 @@
+DESCRIPTION = "The OpenMoko Application Manager"
+SECTION = "openmoko/applications"
+DEPENDS += "ipkg"
+PV = "0.0.1+svn${SRCDATE}"
+
+inherit openmoko
+
diff --git a/packages/openmoko-panel-plugins/openmoko-panel-gsm_svn.bb b/packages/openmoko-panel-plugins/openmoko-panel-gsm_svn.bb
new file mode 100644
index 0000000000..798e94e0c4
--- /dev/null
+++ b/packages/openmoko-panel-plugins/openmoko-panel-gsm_svn.bb
@@ -0,0 +1,7 @@
+DESCRIPTION = "Shows the current time in the OpenMoko panel"
+PV = "0.0.1+svn${SRCDATE}"
+
+inherit openmoko-panel-plugin
+
+FILES_${PN} += "${bindir}/${PN}"
+
diff --git a/packages/openmoko-panel-plugins/openmoko-panel-mainmenu_svn.bb b/packages/openmoko-panel-plugins/openmoko-panel-mainmenu_svn.bb
new file mode 100644
index 0000000000..389a6f2691
--- /dev/null
+++ b/packages/openmoko-panel-plugins/openmoko-panel-mainmenu_svn.bb
@@ -0,0 +1,5 @@
+DESCRIPTION = "Shows the current time in the OpenMoko panel"
+PV = "0.0.1+svn${SRCDATE}"
+
+inherit openmoko-panel-plugin
+
diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb
index b4266a0940..fdbf9f75d2 100644
--- a/packages/tasks/task-base.bb
+++ b/packages/tasks/task-base.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
-PR = "r16"
+PR = "r17"
 
 PACKAGES = "task-base \
             task-base-minimal \
@@ -62,10 +62,10 @@ RDEPENDS_task-base = "\
     ${@base_contains("COMBINED_FEATURES", "pcmcia", "${task-base-pcmcia-rdepends}", "",d)} \
     ${@base_contains("COMBINED_FEATURES", "usbhost", "${task-base-usbhost-rdepends}", "",d)} \
     ${@base_contains("COMBINED_FEATURES", "bluetooth", "${task-base-bluetooth-rdepends}", "",d)} \
+    ${@base_contains("COMBINED_FEATURES", "wifi", "${task-distro-wifi-rdepends}", "",d)} \
     ${@base_contains("DISTRO_FEATURES", "nfs", "${task-distro-nfs-rdepends}", "",d)} \
     ${@base_contains("DISTRO_FEATURES", "ipsec", "${task-distro-ipsec-rdepends}", "",d)} \
     ${@base_contains("DISTRO_FEATURES", "ppp", "${task-distro-ppp-rdepends}", "",d)} \
-    ${@base_contains("DISTRO_FEATURES", "wifi", "${task-distro-wifi-rdepends}", "",d)} \
     ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS} \
     ${MACHINE_EXTRA_RDEPENDS} \
     ${DISTRO_EXTRA_RDEPENDS}"
diff --git a/packages/tasks/task-openmoko.bb b/packages/tasks/task-openmoko.bb
index 08b3c80d07..7400fc679e 100644
--- a/packages/tasks/task-openmoko.bb
+++ b/packages/tasks/task-openmoko.bb
@@ -5,7 +5,7 @@ PACKAGE_ARCH = "all"
 LICENSE = "MIT"
 PROVIDES = "task-openmoko-everything"
 
-PR = "r25"
+PR = "r26"
 
 PACKAGES = "\
   task-openmoko-linux \
@@ -80,7 +80,7 @@ RDEPENDS_task-openmoko-ui = "\
   gtk+ \
   matchbox-common \
   matchbox-wm \
-  matchbox-panel \
+  matchbox-panel-2 \
   xserver-kdrive-fbdev \
   xserver-kdrive-common \
   xserver-nodm-init \
@@ -101,9 +101,10 @@ RDEPENDS_task-openmoko-ui = "\
 DESCRIPTION_task-openmoko-base = "OpenMoko: Main-Menu Launcher, Top Panel, and Footer"
 RDEPENDS_task-openmoko-base = "\
   openmoko-mainmenu \
-# matchbox-panel-2 \
+  matchbox-panel-2 \
   openmoko-footer \
   openmoko-taskmanager \
+  openmoko-panel-mainmenu \
 "
 
 #
@@ -114,6 +115,7 @@ RDEPENDS_task-openmoko-phone = "\
   gsmd \
   libgsmd-tools \
   openmoko-dialer \
+  openmoko-panel-gsm \
 # ppp \
 "
 
diff --git a/packages/tslib/tslib-1.0/.mtn2git_empty b/packages/tslib/tslib-1.0/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/tslib/tslib-1.0/.mtn2git_empty
diff --git a/packages/tslib/tslib-1.0/ts.conf b/packages/tslib/tslib-1.0/ts.conf
new file mode 100644
index 0000000000..82f712ef41
--- /dev/null
+++ b/packages/tslib/tslib-1.0/ts.conf
@@ -0,0 +1,25 @@
+# Uncomment if you wish to use the linux input layer event interface
+module_raw input grab_events=1
+
+# Uncomment if you're using a Sharp Zaurus SL-5500/SL-5000d
+# module_raw collie
+
+# Uncomment if you're using a Sharp Zaurus SL-C700/C750/C760/C860
+# module_raw corgi
+
+# Uncomment if you're using a device with a UCB1200/1300/1400 TS interface
+# module_raw ucb1x00
+
+# Uncomment if you're using an HP iPaq h3600 or similar
+# module_raw h3600
+
+# Uncomment if you're using a Hitachi Webpad
+# module_raw mk712
+
+# Uncomment if you're using an IBM Arctic II
+# module_raw arctic2
+
+module pthres pmin=1
+module variance delta=30
+module dejitter delta=100
+module linear
diff --git a/packages/tslib/tslib-1.0/tslib-input_raw-grab_events.patch b/packages/tslib/tslib-1.0/tslib-input_raw-grab_events.patch
new file mode 100644
index 0000000000..4bd0a05531
--- /dev/null
+++ b/packages/tslib/tslib-1.0/tslib-input_raw-grab_events.patch
@@ -0,0 +1,120 @@
+This patch adds support for "EVIOCGRAB" on the input device, which
+tells the kernel _not_ to deliver events of the touchscreen to
+/dev/input/mice.  
+
+This is probably what most people want, since unprocessed raw touchscreen
+events should not be converted to emulated PS/2 mouse movements.
+
+Signed-off-by: Harald Welte <laforge@openmoko.org>
+
+Index: a/plugins/input-raw.c
+===================================================================
+--- a/plugins/input-raw.c	(revision 49)
++++ b/plugins/input-raw.c	(working copy)
+@@ -18,6 +18,7 @@
+ 
+ #include <errno.h>
+ #include <stdio.h>
++#include <limits.h>
+ 
+ #include <stdlib.h>
+ #ifdef HAVE_UNISTD_H
+@@ -33,6 +34,9 @@
+ 
+ #include "tslib-private.h"
+ 
++#define GRAB_EVENTS_WANTED	1
++#define GRAB_EVENTS_ACTIVE	2
++
+ struct tslib_input {
+ 	struct tslib_module_info module;
+ 
+@@ -42,6 +46,7 @@
+ 
+ 	int	sane_fd;
+ 	int	using_syn;
++	int	grab_events;
+ };
+ 
+ static int check_fd(struct tslib_input *i)
+@@ -64,6 +69,14 @@
+ 
+ 	if (bit & (1 << EV_SYN))
+ 		i->using_syn = 1;
++	
++	if (i->grab_events == GRAB_EVENTS_WANTED) {
++		if (ioctl(ts->fd, EVIOCGRAB, (void *)1)) {
++			fprintf(stderr, "Unable to grab selected input device\n");
++			return -1;
++		}
++		i->grab_events = GRAB_EVENTS_ACTIVE;
++	}
+ 
+ 	return 0;
+ }
+@@ -222,6 +235,15 @@
+ 
+ static int ts_input_fini(struct tslib_module_info *inf)
+ {
++	struct tslib_input *i = (struct tslib_input *)inf;
++	struct tsdev *ts = inf->dev;
++
++	if (i->grab_events == GRAB_EVENTS_ACTIVE) {
++		if (ioctl(ts->fd, EVIOCGRAB, (void *)0)) {
++			fprintf(stderr, "Unable to un-grab selected input device\n");
++		}
++	}
++
+ 	free(inf);
+ 	return 0;
+ }
+@@ -231,6 +253,36 @@
+ 	.fini	= ts_input_fini,
+ };
+ 
++static int parse_raw_grab(struct tslib_module_info *inf, char *str, void *data)
++{
++	struct tslib_input *i = (struct tslib_input *)inf;
++	unsigned long v;
++	int err = errno;
++
++	v = strtoul(str, NULL, 0);
++
++	if (v == ULONG_MAX && errno == ERANGE)
++		return -1;
++	
++	errno = err;
++	switch ((int)data) {
++	case 1:
++		if (v)
++			i->grab_events = GRAB_EVENTS_WANTED;
++		break;
++	default:
++		return -1;
++	}
++	return 0;
++}
++
++static const struct tslib_vars raw_vars[] =
++{
++	{ "grab_events", (void *)1, parse_raw_grab },
++};
++
++#define NR_VARS (sizeof(raw_vars) / sizeof(raw_vars[0]))
++
+ TSAPI struct tslib_module_info *mod_init(struct tsdev *dev, const char *params)
+ {
+ 	struct tslib_input *i;
+@@ -245,5 +297,12 @@
+ 	i->current_p = 0;
+ 	i->sane_fd = 0;
+ 	i->using_syn = 0;
++	i->grab_events = 0;
++
++	if (tslib_parse_vars(&i->module, raw_vars, NR_VARS, params)) {
++		free(i);
++		return NULL;
++	}
++
+ 	return &(i->module);
+ }
diff --git a/packages/tslib/tslib_1.0.bb b/packages/tslib/tslib_1.0.bb
index 0ece5b0331..4ba53f0631 100644
--- a/packages/tslib/tslib_1.0.bb
+++ b/packages/tslib/tslib_1.0.bb
@@ -4,9 +4,10 @@ AUTHOR = "Russell King w/ plugins by Chris Larson et. al."
 SECTION = "base"
 LICENSE = "LGPL"
 
-PR = "r7"
+PR = "r8"
 
 SRC_URI = "http://download.berlios.de/tslib/tslib-1.0.tar.bz2 \
+           file://tslib-input_raw-grab_events.patch;patch=1 \
            file://ts.conf \
            file://ts.conf-simpad-2.4 \
            file://ts.conf-collie-2.4 \