merge of 2b0c75329e8e9e0257dd626d3af2ed2042ff24a4

     and 4f22ecbf9b052611a52b5e12802a2d8a9584cea7

6 files changed, 48 insertions, 8 deletions

diff --git a/packages/gkdial/gkdial_1.8.1.bb b/packages/gkdial/gkdial_1.8.1.bb
index ac37080d11..6bd9d5131d 100644
--- a/packages/gkdial/gkdial_1.8.1.bb
+++ b/packages/gkdial/gkdial_1.8.1.bb
@@ -7,7 +7,7 @@ MAINTAINER = "Florian Boor <florian@kernelconcepts.de>"
 SECTION = "gpe"
 PRIORITY = "optional"
 
-PR = "r2gpe1"
+PR = "r3gpe1"
 
 SRC_URI = "http://familiar.handhelds.org/source/v0.8.2/${PN}-${PV}.tar.gz \
            file://gkdial-pgpe.patch;patch=1 \
@@ -20,7 +20,7 @@ SRC_URI = "http://familiar.handhelds.org/source/v0.8.2/${PN}-${PV}.tar.gz \
 FILES_${PN} = "${sysconfdir}/chatscripts ${bindir} ${datadir}/pixmaps ${datadir}/applications"
 FILES_${PN} += " ${datadir}/gkdial ${datadir}/gkdial/glade ${sysconfdir}/gconf/schemas"
  
-CFLAGS_append = " -I${STAGING_KERNEL_DIR}/include"
+CFLAGS_append = " -I${STAGING_KERNEL_DIR}/include -D_GNU_SOURCE"
 LDFLAGS_append = " -Wl,--export-dynamic"
 
 do_install_append () {
diff --git a/packages/maemo/gconf-osso/gconf-daemon-dbus-oe.sh b/packages/maemo/gconf-osso/gconf-daemon-dbus-oe.sh
new file mode 100644
index 0000000000..90dfdb7eb0
--- /dev/null
+++ b/packages/maemo/gconf-osso/gconf-daemon-dbus-oe.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+# GConf daemon startup script for D-BUS activation
+if [ -x /usr/sbin/dsmetool ]; then
+  /usr/sbin/dsmetool -U messagebus -n -1 -t /usr/lib/gconf2/gconfd-2
+else
+  exec /usr/libexec/gconfd-2
+fi
diff --git a/packages/maemo/osso-core-config_200515.1.bb b/packages/maemo/osso-core-config_200515.1.bb
index 1010e91e8a..e82e5f092d 100644
--- a/packages/maemo/osso-core-config_200515.1.bb
+++ b/packages/maemo/osso-core-config_200515.1.bb
@@ -1,6 +1,6 @@
-LICENSE =	"unknown"
-MAINTAINER=	"Florian Boor <florian@kernelconcepts.de"
-PR 	= "r4"
+LICENSE    = "unknown"
+MAINTAINER = "Florian Boor <florian@kernelconcepts.de"
+PR         = "r5"
 
 DEPENDS =	"base-passwd osso-af-startup"
 RDEPENDS =	"base-passwd osso-af-startup"
@@ -35,7 +35,15 @@ fi
 MAEMOUSER=user
 MAEMOHOME=/home/user
 
+addgroup "$MAEMOUSER"
 mkdir -p $MAEMOHOME/MyDocs || true
-chgrp "$MAEMOUSER" "$MAEMOHOME" 2>/dev/null || addgroup "$MAEMOUSER"
-adduser --system --home "$MAEMOHOME" --no-create-home --disabled-password --ingroup "$MAEMOUSER" "$MAEMOUSER" || chown -R "$MAEMOUSER"."$MAEMOUSER" "$MAEMOHOME" 2>/dev/null
+adduser --system --home "$MAEMOHOME" --no-create-home --disabled-password --ingroup "$MAEMOUSER" "$MAEMOUSER"
+chown -R "$MAEMOUSER"."$MAEMOUSER" "$MAEMOHOME" 2>/dev/null
+chgrp "$MAEMOUSER" "$MAEMOHOME" 2>/dev/null
+# set up some links to firmware and modules in initrd
+
+mkdir -p /lib/firmware
+ln -sf /mnt/initfs/lib/firmware/* /lib/firmware/
+rm -rf /lib/modules
+ln -s /mnt/initfs/lib/modules /lib/modules
 }
diff --git a/packages/tslib/tslib/nokia770/.mtn2git_empty b/packages/tslib/tslib/nokia770/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/tslib/tslib/nokia770/.mtn2git_empty
diff --git a/packages/tslib/tslib/nokia770/ts.conf b/packages/tslib/tslib/nokia770/ts.conf
new file mode 100644
index 0000000000..1b0da937e8
--- /dev/null
+++ b/packages/tslib/tslib/nokia770/ts.conf
@@ -0,0 +1,25 @@
+# Uncomment if you wish to use the linux input layer event interface
+module_raw input
+
+# 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_cvs.bb b/packages/tslib/tslib_cvs.bb
index f83be14b44..b5d073c8e7 100644
--- a/packages/tslib/tslib_cvs.bb
+++ b/packages/tslib/tslib_cvs.bb
@@ -1,7 +1,7 @@
 SECTION = "base"
 DESCRIPTION = "tslib is a touchscreen access library."
 PV = "0.0cvs${CVSDATE}"
-PR = "r19"
+PR = "r29"
 
 SRC_URI_OVERRIDES_PACKAGE_ARCH = "0"
 PACKAGE_ARCH_tslib-conf = "${MACHINE}"