merge of 23f392c4a32f829ba2c33998e47b14cc08c51a26

     and a5ef4c4c70b547e6337fc06d8e0f67f7be568250

28 files changed, 232 insertions, 141 deletions

diff --git a/classes/base.bbclass b/classes/base.bbclass
index 49d6260090..85756edacd 100644
--- a/classes/base.bbclass
+++ b/classes/base.bbclass
@@ -398,8 +398,15 @@ def oe_unpack_file(file, data, url = None):
 				destdir = "."
 			bb.mkdirhier("%s/%s" % (os.getcwd(), destdir))
 			cmd = 'cp %s %s/%s/' % (file, os.getcwd(), destdir)
+
 	if not cmd:
 		return True
+
+	dest = os.path.join(os.getcwd(), os.path.basename(file))
+	if os.path.exists(dest):
+		if os.path.samefile(file, dest):
+			return True
+
 	cmd = "PATH=\"%s\" %s" % (bb.data.getVar('PATH', data, 1), cmd)
 	bb.note("Unpacking %s to %s/" % (file, os.getcwd()))
 	ret = os.system(cmd)
diff --git a/conf/distro/openzaurus-unstable.conf b/conf/distro/openzaurus-unstable.conf
index 14372b5b9e..4a50d24f52 100644
--- a/conf/distro/openzaurus-unstable.conf
+++ b/conf/distro/openzaurus-unstable.conf
@@ -50,8 +50,8 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
 PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
 PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
 
-PREFERRED_VERSION_binutils-cross = "2.16"
-PREFERRED_VERSION_binutils = "2.16"
+PREFERRED_VERSION_binutils-cross = "2.15.94.0.1"
+PREFERRED_VERSION_binutils = "2.15.94.0.1"
 
 #
 # Opie
diff --git a/packages/angstrom/angstrom-bootstrap-image.bb b/packages/angstrom/angstrom-bootstrap-image.bb
index b2b5565eb6..88ace3c1ba 100644
--- a/packages/angstrom/angstrom-bootstrap-image.bb
+++ b/packages/angstrom/angstrom-bootstrap-image.bb
@@ -1,7 +1,7 @@
 #Angstrom bootstrap image
 LICENSE = MIT
 MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>"
-PR = "r0"
+PR = "r2"
 
 DEPENDS = "task-angstrom"
 RDEPENDS = "angstrom-base-depends"
diff --git a/packages/angstrom/angstrom-gpe-image.bb b/packages/angstrom/angstrom-gpe-image.bb
index e6dc88dffb..b6b33e8e45 100644
--- a/packages/angstrom/angstrom-gpe-image.bb
+++ b/packages/angstrom/angstrom-gpe-image.bb
@@ -1,7 +1,7 @@
 #Angstrom GPE image
 LICENSE = MIT
 MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>"
-PR = "r1"
+PR = "r2"
 
 PREFERRED_PROVIDER_libgpewidget 	?= "libgpewidget"
 PREFERRED_PROVIDER_tslib 		?= "tslib"
@@ -18,7 +18,7 @@ RDEPENDS = "\
     ${XSERVER} \
     angstrom-base-depends \
     angstrom-x11-base-depends \
-    angsgrom-gpe-task-base \
+    angstrom-gpe-task-base \
     angstrom-gpe-task-settings \
     angstrom-gpe-task-pim \
     ${ANGSTROM_EXTRA_INSTALL}"
diff --git a/packages/angstrom/task-angstrom.bb b/packages/angstrom/task-angstrom.bb
index 08bc05f58b..ed43fd1001 100644
--- a/packages/angstrom/task-angstrom.bb
+++ b/packages/angstrom/task-angstrom.bb
@@ -1,18 +1,23 @@
 DESCRIPTION = "Task packages for the Angstrom distribution"
-PR = "r6"
+PR = "r11"
 ALLOW_EMPTY = "1"
 
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
 BOOTMODULES_RRECOMMENDS ?= ""
+DEBUG_APPS ?= ""
+DEBUG_APPS += '${@base_conditional("DISTRO_TYPE", "release", "", "strace gdb",d)}'
+
 
 PACKAGES = "\
     angstrom-base-depends \
     angstrom-base-wifi \
     angstrom-x11-base-depends \
-    angsgrom-gpe-task-base \
+    angstrom-gpe-task-base \
     angstrom-gpe-task-settings \
     angstrom-gpe-task-pim \
     angstrom-gpe-task-apps \
-    angstgrom-gpe-task-games \ 
+    angstrom-gpe-task-games \ 
     angstrom-task-office \
     angstrom-task-printing \
     angstrom-task-sectest"
@@ -22,19 +27,26 @@ RDEPENDS_angstrom-base-depends = "\
     base-passwd tinylogin \ 
     busybox \
     udev \
-    update-modules module-init-tools \
+    update-modules module-init-tools modutils-initscripts \
     sysvinit initscripts sysvinit-pidof \
     netbase dropbear \
     angstrom-version \
-    ipkg \
+    ipkg ipkg-collateral \
     wireless-tools \
     tslib-tests tslib-calibrate \
+    ${DEBUG_APPS} \
 "
 
+RDEPENDS_angstrom-base-depends_append_ipaq-pxa270 = " tiinit acx-firmware "
+
+
 RRECOMMENDS_angstrom-base-depends = "\
         ${BOOTMODULES_RRECOMMENDS} \
+	kernel-module-evdev \
+	kernel-module-uinput \
 	kernel-module-g-ether \
 	kernel-module-hostap-cs \
+	kernel-module-af-packet \
 	"
 
 RDEPENDS_angstrom-base-wifi = "\
@@ -49,7 +61,10 @@ RDEPENDS_angstrom-base-wifi = "\
 
 RDEPENDS_angstrom-x11-base-depends := "\
     libx11 \
-    virtual/xserver"
+    virtual/xserver \
+    ttf-dejavu-sans \
+    ttf-dejavu-sans-mono \
+    "
 
 RDEPENDS_angstrom-gpe-task-base := "\
     matchbox \
@@ -60,7 +75,6 @@ RDEPENDS_angstrom-gpe-task-base := "\
     xhost \
     xrdb \
     gpe-soundserver \
-    ttf-dejavu \
     gpe-dm \
     gpe-login \
     gpe-session-scripts \
diff --git a/packages/emacs/emacs_cvs.bb b/packages/emacs/emacs_cvs.bb
index d0e4135580..8322e8f512 100644
--- a/packages/emacs/emacs_cvs.bb
+++ b/packages/emacs/emacs_cvs.bb
@@ -10,7 +10,7 @@ DEPENDS += "qemu-native"
 #NOTE: I have found that this only works with qemu-0.8.0. If I use 0.8.1 or 0.8.2
 # the build gets hung up on compiling certain .el files
 
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "cvs://anoncvs:anonymous@cvs.savannah.gnu.org/sources/emacs;module=emacs \
            file://use-qemu.patch;patch=1"
@@ -18,7 +18,7 @@ S = "${WORKDIR}/emacs"
 
 inherit autotools
 
-PACKAGES = "emacs-el emacs"
+PACKAGES = "${PN}-el ${PN}-dbg ${PN} ${PN}-doc ${PN}-dev ${PN}-locale"
 
 FILES_emacs-el = "${datadir}/emacs/22.0.50/*/*.el.gz \
                   ${datadir}/emacs/22.0.50/*/*/*.el.gz"
diff --git a/packages/nonworking/xlibs/.mtn2git_empty b/packages/gdal/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/nonworking/xlibs/.mtn2git_empty
+++ b/packages/gdal/.mtn2git_empty
diff --git a/packages/gdal/gdal_1.3.2.bb b/packages/gdal/gdal_1.3.2.bb
new file mode 100644
index 0000000000..c445cd1274
--- /dev/null
+++ b/packages/gdal/gdal_1.3.2.bb
@@ -0,0 +1,38 @@
+DESCRIPTION = "GDAL is a translator library for raster geospatial data formats"
+HOMEPAGE = "http://www.gdal.org/"
+LICENSE = "MIT"
+DEPENDS = "zlib"
+
+SRC_URI = "http://www.gdal.org/dl/${P}.tar.gz"
+
+inherit autotools pkgconfig
+
+PARALLEL_MAKE = ""
+
+EXTRA_OECONF = "--without-perl \
+                --without-python \
+                --without-php \
+                --without-ruby \
+                --with-libz=internal \
+                --with-png=internal \
+                --with-jpeg=internal \
+                --with-libtiff=internal \
+                "
+
+do_configure_append() {
+	        sed -i s:/usr/lib:${D}${libdir}: GDALmake.opt
+	        sed -i s:/usr/bin:${D}${bindir}: GDALmake.opt
+	        sed -i s:/usr/share:${D}${datadir}: GDALmake.opt
+	        sed -i s:/usr/include:${D}${includedir}: GDALmake.opt
+}
+
+do_compile() {
+		oe_runmake default
+}
+
+
+do_package_prepend() {
+	# the brokenness....
+	os.system('cp -a ${D}${D}* ${D}../')
+}	
+
diff --git a/packages/gdb/gdb_6.4.bb b/packages/gdb/gdb_6.4.bb
new file mode 100644
index 0000000000..9a290a3e67
--- /dev/null
+++ b/packages/gdb/gdb_6.4.bb
@@ -0,0 +1,49 @@
+DESCRIPTION = "gdb - GNU debugger"
+HOMEPAGE = "http://www.gnu.org/software/gdb/"
+LICENSE="GPL"
+SECTION = "devel"
+PRIORITY = "optional"
+MAINTAINER = "Pawel Osiczko <p.osiczko@tetrapyloctomy.org>"
+DEPENDS = "ncurses readline"
+RDEPENDS_openmn = "libthread-db1"
+
+PACKAGES =+ 'gdbserver '
+FILES_gdbserver = '${bindir}/gdbserver'
+
+inherit autotools gettext
+
+SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.gz \
+#FIXME:	   file://uclibc.patch;patch=1 \
+	   file://kill_arm_map_symbols.patch;patch=1 \
+	   file://gdbserver-cflags-last.diff;patch=1;pnum=0"
+
+LDFLAGS_append = " -s"
+export CC_FOR_BUILD = "${BUILD_CC}"
+export CXX_FOR_BUILD = "${BUILD_CXX}"
+export CPP_FOR_BUILD = "${BUILD_CPP}"
+export CFLAGS_FOR_BUILD = "${BUILD_CFLAGS}"
+export CXXFLAGS_FOR_BUILD = "${BUILD_CXXFLAGS}"
+export CPPFLAGS_FOR_BUILD = "${BUILD_CPPFLAGS}"
+export CFLAGS_append=" -L${STAGING_LIBDIR}"
+EXTRA_OEMAKE = "'SUBDIRS=intl mmalloc libiberty opcodes bfd sim gdb etc utils'"
+
+EXTRA_OECONF = "--disable-gdbtk --disable-tui --disable-x \
+                --with-curses --disable-multilib --with-readline --disable-sim \
+                --program-prefix=''"
+
+S = "${WORKDIR}/gdb-${PV}"
+B = "${WORKDIR}/build-${TARGET_SYS}"
+
+do_configure () {
+# override this function to avoid the autoconf/automake/aclocal/autoheader
+# calls for now
+	(cd ${S} && gnu-configize) || die "failure in running gnu-configize"
+        CPPFLAGS="" oe_runconf
+}
+
+do_install () {
+	make -C bfd/doc chew LDFLAGS= CFLAGS=-O2
+	oe_runmake DESTDIR='${D}' install
+	install -d ${D}${bindir}
+	install -m 0755 gdb/gdbserver/gdbserver ${D}${bindir}
+}
diff --git a/packages/libetpan/files/configure-pthreads.patch b/packages/libetpan/files/configure-pthreads.patch
deleted file mode 100644
index c8f9566bd9..0000000000
--- a/packages/libetpan/files/configure-pthreads.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libetpan-0.45/configure.in.orig	2006-05-09 09:48:36.000000000 +0100
-+++ libetpan-0.45/configure.in	2006-05-09 09:48:55.000000000 +0100
-@@ -350,7 +350,7 @@
-       LDFLAGS="-$flag $LDFLAGS"
-       AC_TRY_LINK([], [pthread_create();], 
-                       [pthflag=yes; checkpthread=no], 
--                      [pthflag=no; LDFLAGS="$OLDCFLAGS"])
-+                      [pthflag=no; LDFLAGS="$OLDFLAGS"])
-       AC_MSG_RESULT($pthflag)
-     fi
-   done
diff --git a/packages/libetpan/files/etpan_suffix.patch b/packages/libetpan/files/etpan_suffix.patch
deleted file mode 100644
index 901615c416..0000000000
--- a/packages/libetpan/files/etpan_suffix.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- libetpan/configure.in~etpan_suffix
-+++ libetpan/configure.in
-@@ -371,7 +371,7 @@
-   REENTRANT=1
- else
-   REENTRANT=0
--  LIBSUFFIX=-no-mt
-+  LIBSUFFIX=
- fi
- AC_SUBST(LIBSUFFIX)
- AC_SUBST(REENTRANT)
diff --git a/packages/libetpan/files/mailstream.patch b/packages/libetpan/files/mailstream.patch
deleted file mode 100644
index 2d0dad06fd..0000000000
--- a/packages/libetpan/files/mailstream.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -urNad libetpan-0.45~/src/data-types/mailstream_ssl.c libetpan-0.45/src/data-types/mailstream_ssl.c
---- libetpan-0.45~/src/data-types/mailstream_ssl.c	2006-02-17 23:45:14.000000000 +0300
-+++ libetpan-0.45/src/data-types/mailstream_ssl.c	2006-04-17 19:11:48.609551256 +0400
-@@ -448,7 +448,7 @@
-       break;
-       
-     default:
--      return r;
-+      return -1;
-     }
-   }
- }
-@@ -486,7 +486,7 @@
-       break;
-       
-     default:
--      return r;
-+      return -1;
-     }
-   }
- }
diff --git a/packages/libetpan/libetpan_0.38.bb b/packages/libetpan/libetpan_0.38.bb
deleted file mode 100644
index 9dcb318b0c..0000000000
--- a/packages/libetpan/libetpan_0.38.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-DESCRIPTION = "libetpan is a library for communicating with mail and news servers using \
-SMTP, POP, IMAP and NNTP"
-SECTION = "libs"
-DEPENDS = "gnutls"
-LICENSE = "BSD"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/libetpan/libetpan-${PV}.tar.gz \
-          file://etpan_suffix.patch;patch=1 "
-
-inherit autotools pkgconfig gettext
-
-EXTRA_OECONF = "--without-openssl --with-gnutls --disable-db --disable-threads"
-
-do_stage () {
-	oe_runmake install includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} bindir=${STAGING_BINDIR}
-}
-
-FILES_${PN} = "${libdir}/lib*.so.*"
-FILES_${PN}-dev = "${bindir} ${includedir} ${libdir}/lib*.so ${libdir}/*.la ${libdir}/*.a ${libdir}/pkgconfig"
diff --git a/packages/libetpan/libetpan_0.43.bb b/packages/libetpan/libetpan_0.43.bb
deleted file mode 100644
index 51757a7265..0000000000
--- a/packages/libetpan/libetpan_0.43.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-DESCRIPTION = "libetpan is a library for communicating with mail and news servers. \
-It supports the protocols SMTP, POP3, IMAP and NNTP."
-HOMEPAGE = "http://www.etpan.org"
-SECTION = "libs"
-DEPENDS = "gnutls"
-LICENSE = "BSD"
-PR = "r0"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/libetpan/libetpan-${PV}.tar.gz \
-          file://etpan_suffix.patch;patch=1 "
-
-inherit autotools pkgconfig gettext
-
-EXTRA_OECONF = "--without-openssl --with-gnutls --disable-db --disable-threads"
-
-do_stage() {
-	oe_runmake install includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} bindir=${STAGING_BINDIR}
-}
-
-FILES_${PN} = "${libdir}/lib*.so.*"
-FILES_${PN}-dev = "${bindir} ${includedir} ${libdir}/lib*.so ${libdir}/*.la ${libdir}/*.a ${libdir}/pkgconfig"
diff --git a/packages/libetpan/libetpan_0.45.bb b/packages/libetpan/libetpan_0.46.bb
index 4b7abede50..b9d7836aea 100644
--- a/packages/libetpan/libetpan_0.45.bb
+++ b/packages/libetpan/libetpan_0.46.bb
@@ -7,17 +7,16 @@ LICENSE = "BSD"
 PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/libetpan/libetpan-${PV}.tar.gz \
-          file://etpan_suffix.patch;patch=1 \
-	  file://mailstream.patch;patch=1 \
-	  file://configure-pthreads.patch;patch=1 "
+           file://honor-oe-lflags.patch;patch=1"
 
 inherit autotools pkgconfig gettext
 
 EXTRA_OECONF = "--without-openssl --with-gnutls --disable-db"
+
 PARALLEL_MAKE = ""
 
 do_stage() {
-	oe_runmake install includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} bindir=${STAGING_BINDIR}
+	autotools_stage_all
 }
 
 FILES_${PN} = "${libdir}/lib*.so.*"
diff --git a/packages/libpng/libpng_1.2.8.bb b/packages/libpng/libpng_1.2.8.bb
index 81274dc762..b1096779fa 100644
--- a/packages/libpng/libpng_1.2.8.bb
+++ b/packages/libpng/libpng_1.2.8.bb
@@ -7,8 +7,9 @@ MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 
 DEPENDS = "zlib"
 
-PACKAGES =+ "${PN}12 ${PN}12-dev"
+PACKAGES =+ "${PN}12-dbg ${PN}12 ${PN}12-dev"
 
+FILES_${PN}12-dbg = ${libdir}/libpng12*.dbg
 FILES_${PN}12 = ${libdir}/libpng12.so.*
 FILES_${PN}12-dev = ${libdir}/libpng12.* ${includedir}/libpng12 ${libdir}/pkgconfig/libpng12.pc
 FILES_${PN} = ${libdir}/lib*.so.*
diff --git a/packages/linux/handhelds-pxa-2.6_cvs.bb b/packages/linux/handhelds-pxa-2.6_cvs.bb
index 7fcfc93943..054868864f 100644
--- a/packages/linux/handhelds-pxa-2.6_cvs.bb
+++ b/packages/linux/handhelds-pxa-2.6_cvs.bb
@@ -25,12 +25,17 @@ ALLOW_EMPTY_ipaq_pxa270 = 1
 K_MAJOR = "2"
 K_MINOR = "6"
 K_MICRO = "16"
-HHV     = "4"
+HHV     = "5"
 #
 
 KERNEL_PRIORITY = "${@'%d' % (int(bb.data.getVar('K_MAJOR',d,1)) * 100000000 + int(bb.data.getVar('K_MINOR',d,1)) * 1000000 + int(bb.data.getVar('K_MICRO',d,1)) * 10000 + float(bb.data.getVar('HHV',d,1)))}"
 do_configure() {
-        rm -f ${S}/.config
+
+	if [ `grep EXTRAVERSION Makefile | grep hh | awk '{print $3}' | sed s/-hh//` != ${HHV} ]; then
+        	die "-hh version mismatch"
+	fi
+
+	rm -f ${S}/.config
 
         if [ ! -e ${WORKDIR}/defconfig ]; then
                 die "No default configuration for ${MACHINE} available."
@@ -57,6 +62,7 @@ do_deploy() {
         install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}
 }
 
+
 do_deploy[dirs] = "${S}"
 
 addtask deploy before do_package after do_compile
diff --git a/packages/linux/linux-h1940_2.6.17-h1940.bb b/packages/linux/linux-h1940_2.6.17-h1940.bb
index efecee302d..3542e6f7b3 100644
--- a/packages/linux/linux-h1940_2.6.17-h1940.bb
+++ b/packages/linux/linux-h1940_2.6.17-h1940.bb
@@ -13,6 +13,7 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.17.tar.bz2 \
            http://rtpnet.nerim.net/ipaq/patches/2.6.17-1/WIP/bluetooth.patch;patch=1 \
            http://rtpnet.nerim.net/ipaq/patches/2.6.17-1/WIP/h1940_batt.patch;patch=1 \
            http://rtpnet.nerim.net/ipaq/patches/2.6.17-1/WIP/mtd_partition.patch;patch=1 \
+           http://anymore.nl/ipaq/usbgadget_fixups.patch;patch=1 \
            file://defconfig"
 
 S = "${WORKDIR}/linux-2.6.17"
diff --git a/packages/nonworking/xlibs/xext_6.4.3.bb b/packages/nonworking/xlibs/xext_6.4.3.bb
deleted file mode 100644
index f8a17fe2db..0000000000
--- a/packages/nonworking/xlibs/xext_6.4.3.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-DESCRIPTION = "X Server Extension library"
-SECTION = "libs"
-PRIORITY = "optional"
-DEPENDS = "xproto x11 xextensions"
-
-SRC_URI = "${XLIBS_MIRROR}/libXext-${PV}.tar.bz2"
-S = "${WORKDIR}/libXext-${PV}"
-
-inherit autotools pkgconfig 
-
-do_stage() {
-	oe_runmake install prefix=${STAGING_DIR} \
-	       bindir=${STAGING_BINDIR} \
-	       includedir=${STAGING_INCDIR} \
-	       libdir=${STAGING_LIBDIR} \
-	       datadir=${STAGING_DATADIR}
-}
diff --git a/packages/nonworking/xlibs/xmu_6.2.3.bb b/packages/nonworking/xlibs/xmu_6.2.3.bb
deleted file mode 100644
index cad9bdc5d5..0000000000
--- a/packages/nonworking/xlibs/xmu_6.2.3.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-SECTION = "libs"
-PRIORITY = "optional"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-DEPENDS = "xt xext xaw"
-
-SRC_URI = "${XLIBS_MIRROR}/libXmu-${PV}.tar.bz2"
-S = "${WORKDIR}/libXmu-${PV}"
-
-inherit autotools pkgconfig 
-
-do_stage () {
-	oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR}
-}
diff --git a/packages/proj4/.mtn2git_empty b/packages/proj4/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/proj4/.mtn2git_empty
diff --git a/packages/proj4/proj-4_4.9.bb b/packages/proj4/proj-4_4.9.bb
new file mode 100644
index 0000000000..cb8dcc5eea
--- /dev/null
+++ b/packages/proj4/proj-4_4.9.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "PROJ.4 - Cartographic Projections Library"
+HOMEPAGE = "http://www.remotesensing.org/proj/"
+LICENSE = "MIT"
+
+inherit autotools pkgconfig
+
+SRC_URI = "ftp://ftp.remotesensing.org/proj/proj-4.${PV}.tar.gz"
+
+S = "${WORKDIR}/proj-4.${PV}"
+
+do_stage() {
+	autotools_stage_all
+}	
+
diff --git a/packages/tasks/task-qpe.bb b/packages/tasks/task-qpe.bb
index 50f42d84fa..d6a73739f5 100644
--- a/packages/tasks/task-qpe.bb
+++ b/packages/tasks/task-qpe.bb
@@ -3,7 +3,7 @@ SECTION = "opie/base"
 ALLOW_EMPTY = 1
 PACKAGE_ARCH = "all"
 LICENSE = "MIT"
-PR = "r6"
+PR = "r7"
 
 PACKAGES = "task-qpe-applets task-qpe-games task-qpe-inputmethods \
 	task-qpe-multimedia task-qpe-emulators task-qpe-applications \
@@ -106,7 +106,8 @@ RDEPENDS_task-qpe-games = "\
     zrally \
     zrev7 \
     zsubhunt \
-    ztappy"
+    ztappy \
+    zudoku"
 
 RDEPENDS_task-qpe-inputmethods = "\
     custominput \
diff --git a/packages/zudoku/.mtn2git_empty b/packages/zudoku/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/zudoku/.mtn2git_empty
diff --git a/packages/zudoku/files/.mtn2git_empty b/packages/zudoku/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/zudoku/files/.mtn2git_empty
diff --git a/packages/zudoku/files/zudoku.desktop b/packages/zudoku/files/zudoku.desktop
new file mode 100644
index 0000000000..5b5f9f29f6
--- /dev/null
+++ b/packages/zudoku/files/zudoku.desktop
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Type=Application
+Exec=zudoku
+Icon=zudoku
+Comment=
+Name=Zudoku
diff --git a/packages/zudoku/files/zudoku.html b/packages/zudoku/files/zudoku.html
new file mode 100644
index 0000000000..b5ceaac4ee
--- /dev/null
+++ b/packages/zudoku/files/zudoku.html
@@ -0,0 +1,51 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+  <head>
+    <title>Fig Labs presents &#039;Zudoku&#039;!</title>
+  </head>
+  <p>
+  <h1>Fig Labs presents &#039;Zudoku&#039;!</h1>
+  <h2>About Zudoku</h2>
+  <p>Sudoku, sometimes written Su Doku, is a logic-based placement puzzle, also known as Number Place in the United States. The aim of the puzzle is to enter a numerical digit from 1 to 9 in each cell of a 9x9 grid, starting with various digits given in some cells (the "givens"). The grid is made up of 3x3 subgrids (called "regions"). Each row, column, and region must contain only one instance of each numeral. Completing the puzzle requires patience and logical ability. Although first published in 1979, Sudoku initially caught on in Japan in 1986 and attained international popularity in 2005. Fig Labs Zudoku is a free version of this popular puzzle for your computer.</p>
+  <h2>About Fig Labs</h2>
+  <p>The Fig Labs management team has over 35 years of portable computing experience; between us we've 'done time' at Psion, Symbian, Motorola, Gemplus and Intuwave, building systems software, applications and middleware. So we now feel that we are uniquely placed to tackle the big issue in constrained appliances - complexity - and subsequently make portable technology usable.</p>
+  <h2>Help</h2>
+  <p>You can use Fig Labs Zudoku to:
+  <ul>
+  <li>Generate an unlimited number of puzzles for you to play.</li>
+  <LI>Enter puzzles from newspapers or magazines so that you can play them on your computer.</LI>
+  <li>Create your own puzzles.</li>
+  <li>Help you with solving puzzles, or even solve an entire puzzle for you.</li>
+  <li>Print puzzles out to solve on paper.</li>
+  </ul>
+  </p>
+  <h3><b>Playing a puzzle</b></h3>
+  <p>When you first start Zudoku, it will generate a new 'medium' level puzzle for you. Thereafter, it will always start up from wherever you left it last time.</p>
+  <p>The bold digits are part of the puzzle, the "givens" - you can't change those unless you are designing the puzzle yourself. Digits you enter yourself are italic.</p>
+	<p>You can fill in the blank squares in two ways:
+  <ol><LI>Either: use the cursor keys to move round the grid and press 1-9 to fill in the current square.</LI>
+  <li>Or: click on a square and choose a digit from the pop-up list to fill it in.</li></ol></p>
+  <p>If you fill a square with a digit which breaks the rules of Sudoku, then that digit and those that it clashes with will be highlighted in red.</p>
+  <p>To delete a digit, just use the cursor keys to move to the square and press Spacebar, or click on it and select the blank entry from the pop-up list.</p>
+  <p>To help you solve more difficult puzzles, you can make 'pencil' marks on the board. Choose 'Make pencil marks' from the Game menu. After that, any moves you make will appear as small numbers in a gold colour. You can pencil in several numbers in as many squares as you like. To erase a pencil mark, enter the same number again. To erase all marks in a square, press Spacebar or choose the blank entry from the pop up menu.</p>
+  <p>If you want to start the current puzzle afresh, go to the Game menu and choose Start again.</p>
+  <p>If you want to print the puzzle out, choose Print from the File menu.</p>
+  <h3><b>Creating a new puzzle</b></h3>
+  <p>To start a new puzzle from scratch, go to the Game menu and choose New puzzle. While Zudoku is working, the grid will fill with question marks. When it is ready you will be presented with a brand new puzzle - probably one that has never been seen before!</p>
+  <p>When you start Zudoku, it is set to generate 'medium' level puzzles. To change the level of puzzle generated, go to the Game menu, choose New puzzle level, then pick a new level. If you set the level to Fiendish, sometimes Zudoku can only make a Difficult puzzle. If that happens, just generate again. If you choose 'Unlimited' Zudoku will try and make the hardest puzzle it can.</p>
+  <h3><b>Entering a printed puzzle</b></h3>
+  <p>If you have a printed puzzle, for example in a newspaper, magazine or book, you can enter that into Zudoku. You can then play it or solve it on your computer. To do this, just follow these steps:</p>
+  <p>
+  <ol><LI>Choose Design mode from the Game menu.</LI>
+  <li>Blank out the puzzle by choosing New blank puzzle from the Game menu.</li>
+  <li>Use the cursor keys or the pop-up list to enter digits into the puzzle to match the printed copy.</li>
+  <li>Choose Design mode again from the Game menu to leave Design mode. Zudoku now gives it a difficulty rating and you can start playing.</li></ol></p>
+  <h3><b>Creating your own puzzles</b></h3>
+  <p>Have a go at making your own puzzles - it's harder than it looks! Just go to Design mode as above, and place some digits.</p>
+	<p>If you try and put a digit in an invalid position while in Design mode, Zudoku won't let you do it. Try putting it somewhere else, or changing one of the other digits in the puzzle first.</p>
+	<p>Leave Design mode and see what Zudoku makes of your puzzle. It may tell you that there are Many solutions to the puzzle. In this case, you need to enter some more digits to make sure there is only a single solution. Sometimes Zudoku will think for a while and tell you there is no solution - you probably need to remove some digits to make your puzzle solvable.</p>
+  <h3><b>Helping you solve and design</b></h3>
+  <p>You can ask Zudoku to show you what numbers can possibly go in the empty squares. From the Game menu, choose Show possible moves. Zudoku will fill in small green digits to show the possibilities for each space. If there are 7 or more possible digits, Zudoku just puts an asterisk. If there are no possible digits, Zudoku puts a red exclamation mark.</p>
+  <p>If it all gets too much, or you are just interested to watch, you can ask Zudoku to solve the puzzle for you. Just choose Solve from the Game menu. You will see Zudoku rapidly filling in squares until the grid is full. Where a puzzle has more than one solution, it will simply display the first solution it comes across. If the puzzle is not solvable, Zudoku will try for a while before giving up and telling you.</p>
+  </body>
+</html>
\ No newline at end of file
diff --git a/packages/zudoku/zudoku_1.1.bb b/packages/zudoku/zudoku_1.1.bb
new file mode 100644
index 0000000000..46c64ebb6e
--- /dev/null
+++ b/packages/zudoku/zudoku_1.1.bb
@@ -0,0 +1,22 @@
+DESCRIPTION = "A Sudoku Game for Opie"
+HOMEPAGE = "http://figlabs.com"
+AUTHOR = "FigLabs"
+LICENSE = "GPL"
+SECTION = "opie/games"
+APPTYPE = "binary"
+APPDESKTOP = "${WORKDIR}"
+
+SRC_URI = "http://www.vanille.de/mirror/zudoku-${PV}.tar.gz \
+           file://zudoku.html \
+           file://zudoku.desktop"
+
+inherit opie
+
+EXTRA_QMAKEVARS_POST += "TARGET=zudoku"
+
+do_install() {
+	install -d ${D}${palmtopdir}/help/en/html
+	install -m 0644 ${WORKDIR}/zudoku.html ${D}${palmtopdir}/help/en/html/
+	install -d ${D}${palmtopdir}/pics/
+	install -m 0644 zudoku64x64.png ${D}${palmtopdir}/pics/zudoku.png
+}