merge of 29e89051e9a2c503357df607dde2562d060d5989

     and 69b99cade429033901bed0a58c27d6c6537ba35b

79 files changed, 670 insertions, 222 deletions

diff --git a/packages/abiword/abiword-plugins_2.4.5.bb b/packages/abiword/abiword-plugins_2.4.5.bb
new file mode 100644
index 0000000000..75861792dd
--- /dev/null
+++ b/packages/abiword/abiword-plugins_2.4.5.bb
@@ -0,0 +1,26 @@
+DESCRIPTION ="AbiWord is free word processing program similar to Microsoft(r) Word""
+HOMEPAGE="http://www.abiword.org""
+MAINTAINER="Koen Kooi <koen@dominion.kabel.utwente.nl>"
+LICENSE="GPLv2"
+
+DEPENDS     = "abiword libwpd librsvg goffice poppler"
+PR="r0"
+
+SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz \
+           file://abiword-plugin-pdf-poppler.patch;patch=1;pnum=2"
+S = "${WORKDIR}/abiword-${PV}/abiword-plugins"
+
+inherit autotools
+
+PARALLEL_MAKE=""
+
+EXTRA_OECONF = "--without-libwmf"
+
+PACKAGES_DYNAMIC = "abiword-plugin-*"
+
+python populate_packages_prepend () {
+	abiword_libdir = bb.data.expand('${libdir}/AbiWord-2.4/plugins', d)
+
+	do_split_packages(d, abiword_libdir, '^libAbi(.*)\.so$', 'abiword-plugin-%s', 'Abiword plugin for %s', extra_depends='')
+}
+
diff --git a/packages/abiword/abiword_2.4.5.bb b/packages/abiword/abiword_2.4.5.bb
new file mode 100644
index 0000000000..8b1ed52d8a
--- /dev/null
+++ b/packages/abiword/abiword_2.4.5.bb
@@ -0,0 +1,42 @@
+DESCRIPTION ="AbiWord is free word processing program similar to Microsoft(r) Word""
+HOMEPAGE="http://www.abiword.org""
+MAINTAINER="Koen Kooi <koen@handhelds.org>"
+LICENSE="GPLv2"
+
+DEPENDS     = "perl-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="r0"
+
+SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz"
+S = "${WORKDIR}/abiword-${PV}/abi"
+
+FILES_${PN} += " ${datadir}/icons/* \
+${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
+
+PARALLEL_MAKE=""
+
+EXTRA_OECONF = "--disable-pspell --enable-enchant"
+
+do_install_append() {
+        install -d ${D}${datadir}/pixmaps/
+        mv ${D}${datadir}/icons/* ${D}${datadir}/pixmaps/
+}
+
+
diff --git a/packages/billiardz/billiardz_0.1.4.bb b/packages/billiardz/billiardz_0.1.4.bb
index fcba6d2f30..c0477bd4fc 100644
--- a/packages/billiardz/billiardz_0.1.4.bb
+++ b/packages/billiardz/billiardz_0.1.4.bb
@@ -5,9 +5,10 @@ PRIORITY = "optional"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 DEPENDS = "libsdl-qpe libsdl-image"
-PR = "r1"
+PR = "r2"
 
-SRC_URI = "http://www.chipx86.com/packages/ipkg/billiardz-${PV}.tar.gz"
+SRC_URI = "http://www.chipx86.com/packages/ipkg/billiardz-${PV}.tar.gz \
+           file://gcc4.patch;patch=1"
 
 inherit palmtop
 
diff --git a/packages/conserver/conserver.inc b/packages/conserver/conserver.inc
new file mode 100644
index 0000000000..579def2fab
--- /dev/null
+++ b/packages/conserver/conserver.inc
@@ -0,0 +1,31 @@
+DESCRIPTION = "Conserver provides remote access to serial port \
+consoles and logs all data to a central host."
+HOMEPAGE = "http://www.conserver.com/"
+SECTION = "console/network"
+LICENSE = "BSD"
+
+SRC_URI = "http://www.conserver.com/conserver-${PV}.tar.gz \
+	   file://conserver.init \
+	   file://conserver.default"
+
+inherit autotools update-rc.d
+
+# Settings for the initscript
+INITSCRIPT_NAME    = "conserver"
+INITSCRIPT_PARAMS  = "defaults 98 2"
+
+# Stop install being called with -s so it doesn't try and run the host strip command
+EXTRA_OEMAKE=" INSTALL_PROGRAM=install"
+
+# Include the examples in the documentation package
+FILES_${PN}-doc += "${datadir}/examples/conserver"
+
+# Indicate that the default file is a configuation file
+CONFFILES_${PN} = "${sysconfdir}/default/conserver"
+
+# Include the init script and default settings in the package
+do_install_append () {
+	install -m 0755 -d ${D}${sysconfdir}/default ${D}${sysconfdir}/init.d
+	install -m 0644 ${WORKDIR}/conserver.default ${D}${sysconfdir}/default/conserver
+	install -m 0755 ${WORKDIR}/conserver.init ${D}${sysconfdir}/init.d/conserver
+}
diff --git a/packages/conserver/conserver_8.1.14.bb b/packages/conserver/conserver_8.1.14.bb
new file mode 100644
index 0000000000..ce7ba48efc
--- /dev/null
+++ b/packages/conserver/conserver_8.1.14.bb
@@ -0,0 +1,2 @@
+include conserver.inc
+PR="r2"
diff --git a/packages/conserver/conserver_8.1.2.bb b/packages/conserver/conserver_8.1.2.bb
index b3f57b544c..306a3f5129 100644
--- a/packages/conserver/conserver_8.1.2.bb
+++ b/packages/conserver/conserver_8.1.2.bb
@@ -1,7 +1,2 @@
-DESCRIPTION = "Conserver provides remote access to serial port \
-consoles and logs all data to a central host."
-SECTION = "console/network"
-LICENSE = "BSD"
-SRC_URI = "http://www.conserver.com/conserver-${PV}.tar.gz"
-
-inherit autotools
+include conserver.inc
+PR="r3"
diff --git a/packages/gpe-timesheet/gpe-timesheet-0.13/.mtn2git_empty b/packages/conserver/files/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/gpe-timesheet/gpe-timesheet-0.13/.mtn2git_empty
+++ b/packages/conserver/files/.mtn2git_empty
diff --git a/packages/conserver/files/conserver.default b/packages/conserver/files/conserver.default
new file mode 100644
index 0000000000..64e589c6a2
--- /dev/null
+++ b/packages/conserver/files/conserver.default
@@ -0,0 +1,2 @@
+# Set the port (otherwise it needs conserver in /etc/services)
+CONSERVER_ARGS="-p 782"
diff --git a/packages/conserver/files/conserver.init b/packages/conserver/files/conserver.init
new file mode 100644
index 0000000000..dfbb72c6be
--- /dev/null
+++ b/packages/conserver/files/conserver.init
@@ -0,0 +1,37 @@
+#!/bin/sh
+#
+# Startup for conserver
+#
+
+PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+DAEMON=/usr/sbin/conserver
+PIDFILE="/var/run/conserver.pid"
+DESC="Serial console server"
+CONF="/etc/conserver.cf"
+
+test ! -r /etc/default/conserver || . /etc/default/conserver
+test -x "$DAEMON" || exit 0
+test -f "$CONF" || exit 0
+
+case "$1" in
+	'start')
+		echo "Starting console server daemon"
+		start-stop-daemon -S -x "$DAEMON" -- -d $CONSERVER_ARGS
+		;;
+
+	'stop')
+		echo "Stopping console server daemon"
+		start-stop-daemon -K -x "$DAEMON"
+		;;
+
+	'restart')
+		echo "Restarting console server daemon"
+		[ -e $PIDFILE ] && kill -HUP `cat $PIDFILE`
+		;;
+
+	*)
+		echo "Usage: $0 { start | stop | restart }"
+		;;
+
+esac
+exit 0
diff --git a/packages/gemdropx/gemdropx_0.9.bb b/packages/gemdropx/gemdropx_0.9.bb
index a50fd6b567..4f96715b79 100644
--- a/packages/gemdropx/gemdropx_0.9.bb
+++ b/packages/gemdropx/gemdropx_0.9.bb
@@ -18,6 +18,7 @@ EXTRA_QMAKEVARS_POST += "CONFIG-=qt \
                          LIBS+=-lSDL_mixer \
 			 LIBS+=-lSDL_image \
                          LIBS+=-lpthread \
+                         LIBS+=-Wl,-rpath-link,${OE_QMAKE_LIBDIR_QT} \
                          DEFINES+=DATA_PREFIX=\\"\"${datadir}/gemdropx/\\"\""
 
 do_configure_prepend() {
diff --git a/packages/gpe-bluetooth/gpe-bluetooth_0.45.bb b/packages/gpe-bluetooth/gpe-bluetooth_0.45.bb
deleted file mode 100644
index cce7301b38..0000000000
--- a/packages/gpe-bluetooth/gpe-bluetooth_0.45.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-LICENSE = "GPL"
-inherit gpe autotools
-
-DESCRIPTION = "GPE bluetooth support"
-DEPENDS = "gtk+ libdisplaymigration libgpewidget openobex libgpevtype bluez-libs sqlite dbus libglade blueprobe bluez-utils-dbus"
-RDEPENDS = "bluez-utils-dbus blueprobe"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-SECTION = "gpe"
-PRIORITY = "optional"
-PR = "r1"
-
-SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.bz2 \
-	   file://bluez-pin-gpe.glade"
-
-FILES_${PN} += '${datadir}/bluez-pin'
-
-do_install_append() {
-install -d ${D}${datadir}/bluez-pin
-install -m 644 ${WORKDIR}/bluez-pin-gpe.glade ${D}${datadir}/bluez-pin/
-
-}
-
diff --git a/packages/gpe-bluetooth/gpe-bluetooth_0.46.bb b/packages/gpe-bluetooth/gpe-bluetooth_0.46.bb
deleted file mode 100644
index 59b371897e..0000000000
--- a/packages/gpe-bluetooth/gpe-bluetooth_0.46.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-LICENSE = "GPL"
-inherit gpe autotools
-
-DESCRIPTION = "GPE bluetooth support"
-DEPENDS = "gtk+ libdisplaymigration libgpewidget openobex libgpevtype bluez-libs sqlite dbus libglade blueprobe bluez-utils-dbus"
-RDEPENDS = "bluez-utils-dbus blueprobe"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-SECTION = "gpe"
-PRIORITY = "optional"
-PR = "r0"
-
-SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.bz2"
-
-FILES_${PN} += '${datadir}/bluez-pin'
diff --git a/packages/gpe-bluetooth/gpe-bluetooth_0.47.bb b/packages/gpe-bluetooth/gpe-bluetooth_0.47.bb
deleted file mode 100644
index 59b371897e..0000000000
--- a/packages/gpe-bluetooth/gpe-bluetooth_0.47.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-LICENSE = "GPL"
-inherit gpe autotools
-
-DESCRIPTION = "GPE bluetooth support"
-DEPENDS = "gtk+ libdisplaymigration libgpewidget openobex libgpevtype bluez-libs sqlite dbus libglade blueprobe bluez-utils-dbus"
-RDEPENDS = "bluez-utils-dbus blueprobe"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-SECTION = "gpe"
-PRIORITY = "optional"
-PR = "r0"
-
-SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.bz2"
-
-FILES_${PN} += '${datadir}/bluez-pin'
diff --git a/packages/gpe-bluetooth/gpe-bluetooth_0.48.bb b/packages/gpe-bluetooth/gpe-bluetooth_0.48.bb
deleted file mode 100644
index bc79545182..0000000000
--- a/packages/gpe-bluetooth/gpe-bluetooth_0.48.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-LICENSE = "GPL"
-DESCRIPTION = "GPE bluetooth support"
-SECTION = "gpe"
-PRIORITY = "optional"
-
-DEPENDS = "gtk+ libdisplaymigration libgpewidget openobex libgpevtype bluez-libs sqlite dbus libglade blueprobe bluez-utils-dbus"
-RDEPENDS = "bluez-utils-dbus blueprobe"
-
-GPE_TARBALL_SUFFIX= "bz2"
-inherit gpe autotools
-
-FILES_${PN} += '${datadir}/bluez-pin'
diff --git a/packages/gpe-bluetooth/gpe-bluetooth_0.54.bb b/packages/gpe-bluetooth/gpe-bluetooth_0.54.bb
new file mode 100644
index 0000000000..ce28d0b347
--- /dev/null
+++ b/packages/gpe-bluetooth/gpe-bluetooth_0.54.bb
@@ -0,0 +1,14 @@
+LICENSE     = "GPL"
+DESCRIPTION = "GPE bluetooth support user interface tool."
+SECTION     = "gpe"
+PRIORITY    = "optional"
+MAINTAINER  = "Florian Boor <florian.boor@kernelconcepts.de>"
+PR          = "r0"
+
+DEPENDS = "gtk+ libcontactsdb libdisplaymigration libgpewidget openobex libgpevtype bluez-libs sqlite dbus libglade blueprobe bluez-utils-dbus"
+RDEPENDS = "bluez-utils-dbus blueprobe"
+
+GPE_TARBALL_SUFFIX= "bz2"
+inherit gpe autotools
+
+FILES_${PN} += '${datadir}/bluez-pin'
diff --git a/packages/gpe-conf/gpe-conf_cvs.bb b/packages/gpe-conf/gpe-conf_cvs.bb
index 552fc7def5..a0bec2b70f 100644
--- a/packages/gpe-conf/gpe-conf_cvs.bb
+++ b/packages/gpe-conf/gpe-conf_cvs.bb
@@ -2,13 +2,11 @@ DEFAULT_PREFERENCE = "-1"
 
 S = "${WORKDIR}/${PN}"
 PV = "0.1.29+cvs${SRCDATE}"
-PR = "r1"
+PR = "r2"
 
-inherit gpe
+inherit autotools gpe
 
-SRC_URI =	"${HANDHELDS_CVS};module=gpe/base/${PN} \
-		 file://Makefile.dpkg_ipkg \
-    		 file://Makefile.translation"
+SRC_URI =	"${HANDHELDS_CVS};module=gpe/base/${PN}"
 
 PACKAGES = "gpe-conf gpe-conf-panel"
 LICENSE = "GPL"
@@ -25,17 +23,3 @@ FILES_${PN} = "${sysconfdir} ${bindir} ${datadir}/pixmaps \
 		${datadir}/gpe-conf"
 FILES_gpe-conf-panel = "${datadir}/applications/gpe-conf.desktop"
 
-
-do_compile () {
-	sed -i 's:CVSBUILD = yes:CVSBUILD = no:' Makefile
-	mkdir build
-	cp ${WORKDIR}/Makefile.* build/
-	oe_runmake PREFIX=${prefix}
-	oe_runmake all-desktop PREFIX=${prefix}
-}
-
-do_install () {
-        oe_runmake PREFIX=${prefix} DESTDIR=${D} install-program
-}
-
-
diff --git a/packages/gpe-contacts/gpe-contacts_0.36.bb b/packages/gpe-contacts/gpe-contacts_0.36.bb
deleted file mode 100644
index 28e93b48b0..0000000000
--- a/packages/gpe-contacts/gpe-co