merge of 85fd10648ec4aa2a8ae0c12145857b60fe032501

     and 9c5379a0c5df10e0d169d6dd5f45ec4644656971

26 files changed, 196 insertions, 369 deletions

diff --git a/packages/gpe-bootsplash/files/speed.patch b/packages/gpe-bootsplash/files/speed.patch
index 32d0432a87..cc670d00e4 100644
--- a/packages/gpe-bootsplash/files/speed.patch
+++ b/packages/gpe-bootsplash/files/speed.patch
@@ -38,7 +38,7 @@
 +		then			
 +			readlink /usr/share/gpe/$source_link > /etc/bootsplash.name
 +			
-+			cat /dev/fb0 > /etc/bootsplash.raw ; gzip /etc/bootsplash.raw
++			cat /dev/fb0 | gzip >/etc/bootsplash.raw.gz
 +		else
 +			echo -e "\nNOTE: gpe-bootsplash failed to start" >/dev/tty2
 +			sleep 3
diff --git a/packages/gpe-bootsplash/gpe-bootsplash_1.15.bb b/packages/gpe-bootsplash/gpe-bootsplash_1.15.bb
index ca48c6086b..761a0500c7 100644
--- a/packages/gpe-bootsplash/gpe-bootsplash_1.15.bb
+++ b/packages/gpe-bootsplash/gpe-bootsplash_1.15.bb
@@ -5,7 +5,7 @@ MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 SECTION = "gpe"
 PRIORITY = "optional"
 LICENSE = "GPL"
-PR = "r3"
+PR = "r4"
 
 SRC_URI += "file://splash-p.svg \
 	    file://splash-l.svg \
diff --git a/packages/gtk+/gtk+_2.8.16.bb b/packages/gtk+/gtk+_2.8.16.bb
index 5f96cd2c3a..474858856c 100644
--- a/packages/gtk+/gtk+_2.8.16.bb
+++ b/packages/gtk+/gtk+_2.8.16.bb
@@ -5,7 +5,7 @@ HOMEPAGE = "http://www.gtk.org"
 SECTION = "libs"
 PRIORITY = "optional"
 MAINTAINER = "Philip Blundell <pb@handhelds.org>"
-DEPENDS = "glib-2.0 pango atk jpeg libpng xext libxcursor gtk-doc libgcrypt cairo"
+DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt cairo"
 PR = "r2"
 
 DEFAULT_PREFERENCE = "-1"
diff --git a/packages/libetpan/libetpan-0.36/.mtn2git_empty b/packages/libetpan/files/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/libetpan/libetpan-0.36/.mtn2git_empty
+++ b/packages/libetpan/files/.mtn2git_empty
diff --git a/packages/libetpan/libetpan-0.38/etpan_suffix.patch b/packages/libetpan/files/etpan_suffix.patch
index 901615c416..901615c416 100644
--- a/packages/libetpan/libetpan-0.38/etpan_suffix.patch
+++ b/packages/libetpan/files/etpan_suffix.patch
diff --git a/packages/libetpan/libetpan-0.36/etpan_configure.patch b/packages/libetpan/libetpan-0.36/etpan_configure.patch
deleted file mode 100644
index 3572339010..0000000000
--- a/packages/libetpan/libetpan-0.36/etpan_configure.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- libetpan/configure.in~etpan_configure	2005-03-10 10:11:29.000000000 +0100
-+++ libetpan/configure.in	2005-03-11 13:57:00.232491234 +0100
-@@ -76,6 +76,38 @@
- esac
- fi
- 
-+dnl GNUTLS
-+AC_ARG_WITH(gnutls,    [ --with-gnutls[=DIR]      include GnuTLS support (default=no)],
-+ [], [with_gnutls=no])
-+if test "x$with_gnutls" != "xno"; then
-+  OCPPFLAGS="$CPPFLAGS"
-+  OLDFLAGS="$LDFLAGS"
-+  if test "x$with_gnutls" != "xyes" ; then
-+    CPPFLAGS="CRPPFLAGS -I$with_gnutls/include"
-+    LDFLAGS="$LDFLAGS -L$with_gnutls/lib"
-+  fi
-+  GNUTLSLIBS=""
-+  AC_CHECK_HEADER(gnutls/gnutls.h, [
-+  AC_CHECK_LIB(gnutls, gnutls_global_deinit, with_gnutls=yes,[GNUTLSLIBS="-lgnutls -lgnutls-openssl"])
-+  ])
-+  if test "x$with_gnutls" != "xyes"; then
-+   CPPFLAGS="$OCPPFLAGS"
-+   LDFLAGS="$OLDFLAGS"
-+  else
-+   with_openssl="no"
-+  fi
-+fi
-+
-+if test "x$with_gnutls" = "xyes"; then
-+  AC_DEFINE([USE_GNUTLS],1, [Define to use GnuTLS])
-+  AC_DEFINE([USE_SSL], 1, [Define to use OpenSSL])
-+  GNUTLSLIBS="-lgnutls -lgnutls-openssl"
-+else
-+  AC_MSG_WARN([GnuTLS support disabled.])
-+  GNUTLSLIBS=""
-+fi
-+AC_SUBST(GNUTLSLIBS)
-+
- dnl OpenSSL -- very primitive right now
- AC_ARG_WITH(openssl,   [  --with-openssl[=DIR]    include OpenSSL support (default=auto)],
-             [], [with_openssl=yes])
-@@ -336,7 +368,7 @@
-   REENTRANT=1
- else
-   REENTRANT=0
--  LIBSUFFIX=-no-mt
-+  LIBSUFFIX=
- fi
- AC_SUBST(LIBSUFFIX)
- AC_SUBST(REENTRANT)
diff --git a/packages/libetpan/libetpan-0.36/gnutls.patch b/packages/libetpan/libetpan-0.36/gnutls.patch
deleted file mode 100644
index d2ccdcf9d0..0000000000
--- a/packages/libetpan/libetpan-0.36/gnutls.patch
+++ /dev/null
@@ -1,214 +0,0 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- libetpan/src/Makefile.in~gnutls	2005-03-10 10:11:30.000000000 +0100
-+++ libetpan/src/Makefile.in	2005-03-11 21:43:10.975597607 +0100
-@@ -15,7 +15,7 @@
- 
- VERSINFO    = @API_VERSION@
- CC          = @CC@
--LDFLAGS     = @LIBS@ @SSLLIBS@ @LDFLAGS@ @DBLIB@
-+LDFLAGS     = @LIBS@ @SSLLIBS@ @LDFLAGS@ @DBLIB@ @GNUTLSLIBS@
- 
- SUBLIBS = data-types/libdata-types.la \
- 	low-level/liblow-level.la \
---- libetpan/src/data-types/mailstream_ssl.c~gnutls	2005-03-10 10:11:30.000000000 +0100
-+++ libetpan/src/data-types/mailstream_ssl.c	2005-03-11 21:44:56.373673788 +0100
-@@ -61,7 +61,12 @@
- /* mailstream_low, ssl */
- 
- #ifdef USE_SSL
-+#ifndef USE_GNUTLS
- #include <openssl/ssl.h>
-+#else
-+#include <errno.h>
-+#include <gnutls/openssl.h>
-+#endif
- #ifdef LIBETPAN_REENTRANT
- #include <pthread.h>
- #endif
-@@ -85,9 +90,9 @@
- #ifdef USE_SSL
- static int mailstream_low_ssl_close(mailstream_low * s);
- static ssize_t mailstream_low_ssl_read(mailstream_low * s,
--				       void * buf, size_t count);
-+                       void * buf, size_t count);
- static ssize_t mailstream_low_ssl_write(mailstream_low * s,
--					const void * buf, size_t count);
-+                    const void * buf, size_t count);
- static void mailstream_low_ssl_free(mailstream_low * s);
- static int mailstream_low_ssl_get_fd(mailstream_low * s);
- 
-@@ -113,10 +118,10 @@
-   SSL_CTX * tmp_ctx;
-   int fd_flags;
-   int old_fd_flags;
--  
-+
- #ifdef LIBETPAN_REENTRANT
-   pthread_mutex_lock(&ssl_lock);
--#endif  
-+#endif
-   if (!ssl_init_done) {
-     SSL_library_init();
-     ssl_init_done = 1;
-@@ -124,35 +129,37 @@
- #ifdef LIBETPAN_REENTRANT
-   pthread_mutex_unlock(&ssl_lock);
- #endif
--  
-+
-   tmp_ctx = SSL_CTX_new(TLSv1_client_method());
-   if (tmp_ctx == NULL)
-     goto err;
--  
-+
-   ssl_conn = (SSL *) SSL_new(tmp_ctx);
-   if (ssl_conn == NULL)
-     goto free_ctx;
--  
-+
-   if (SSL_set_fd(ssl_conn, fd) == 0)
-     goto free_ssl_conn;
--  
-+
-+#ifndef USE_GNUTLS
-   SSL_set_read_ahead(ssl_conn, 1);
--  
-+#endif
-+
-   r = SSL_connect(ssl_conn);
-   if (r <= 0)
-     goto free_ssl_conn;
--  
-+
-   fd_flags = fcntl(fd, F_GETFL, 0);
-   old_fd_flags = fd_flags;
-   fd_flags |= O_NDELAY;
-   r = fcntl(fd, F_SETFL, fd_flags);
-   if (r < 0)
-     goto free_ssl_conn;
--  
-+
-   ssl_data = malloc(sizeof(* ssl_data));
-   if (ssl_data == NULL)
-     goto reset_fd_flags;
--  
-+
-   ssl_data->fd = fd;
-   ssl_data->ssl_conn = ssl_conn;
-   ssl_data->ssl_ctx = tmp_ctx;
-@@ -241,52 +248,101 @@
- }
- 
- static ssize_t mailstream_low_ssl_read(mailstream_low * s,
--				       void * buf, size_t count)
-+                       void * buf, size_t count)
- {
-   struct mailstream_ssl_data * ssl_data;
-   int r;
- 
-   ssl_data = (struct mailstream_ssl_data *) s->data;
--  
-+
-   while (1) {
-     int ssl_r;
-     fd_set fds_read;
-+#ifndef USE_GNUTLS
-     struct timeval timeout;
--    
-+#else
-+    fd_set fds_excp;
-+
-+    {
-+        struct timeval timeout2;
-+        timeout2 = mailstream_network_delay;
-+
-+        FD_ZERO(&fds_read);
-+        FD_SET(ssl_data->fd, &fds_read);
-+        FD_ZERO(&fds_excp);
-+        FD_SET(ssl_data->fd, &fds_excp);
-+        r = select(ssl_data->fd + 1, &fds_read, NULL, &fds_excp, &timeout2);
-+        if (r==0) {
-+            return -1;
-+        }
-+        if (FD_ISSET(ssl_data->fd, &fds_excp))
-+            return -1;
-+        if (!FD_ISSET(ssl_data->fd, &fds_read))
-+            return 0;
-+    }
-+#endif
-     r = SSL_read(ssl_data->ssl_conn, buf, count);
--    if (r > 0)
-+    if (r > 0) {
-       return r;
--    
-+    }
-+#ifdef USE_GNUTLS
-+    if (errno!=EAGAIN&&errno!=EWOULDBLOCK) {
-+        return r;
-+    }
-+#else
-     ssl_r = SSL_get_error(ssl_data->ssl_conn, r);
-     switch (ssl_r) {
-     case SSL_ERROR_NONE:
-       return r;
--      
-+
-     case SSL_ERROR_ZERO_RETURN:
-       return r;
--      
-+
-     case SSL_ERROR_WANT_READ:
-       timeout = mailstream_network_delay;
--      
-+
-       FD_ZERO(&fds_read);
-       FD_SET(ssl_data->fd, &fds_read);
-       r = select(ssl_data->fd + 1, &fds_read, NULL, NULL, &timeout);
-       if (r == 0)
-         return -1;
-       break;
--      
-+
-     default:
-       return r;
-     }
-+#endif
-   }
- }
- 
- static ssize_t mailstream_low_ssl_write(mailstream_low * s,
--					const void * buf, size_t count)
-+                    const void * buf, size_t count)
- {
-   struct mailstream_ssl_data * ssl_data;
- 
-   ssl_data = (struct mailstream_ssl_data *) s->data;
-+#ifdef USE_GNUTLS
-+  {
-+    fd_set fds_write;
-+    fd_set fds_excp;
-+    struct timeval timeout;
-+    int r;
-+
-+    timeout = mailstream_network_delay;
-+
-+    FD_ZERO(&fds_write);
-+    FD_SET(ssl_data->fd, &fds_write);
-+    FD_ZERO(&fds_excp);
-+    FD_SET(ssl_data->fd, &fds_excp);
-+    r = select(ssl_data->fd + 1, NULL, &fds_write, &fds_excp, &timeout);
-+    if (r == 0)
-+      return -1;
-+    if (FD_ISSET(ssl_data->fd, &fds_excp))
-+      return -1;
-+    if (!FD_ISSET(ssl_data->fd, &fds_write))
-+      return 0;
-+  }
-+#endif
-   return SSL_write(ssl_data->ssl_conn, buf, count);
- }
- #endif
diff --git a/packages/libetpan/libetpan-0.36/reentrant.patch b/packages/libetpan/libetpan-0.36/reentrant.patch
deleted file mode 100644
index eaf1edfe22..0000000000
--- a/packages/libetpan/libetpan-0.36/reentrant.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- libetpan/src/data-types/mailsem.c~reentrant	2005-01-28 02:43:11.000000000 +0100
-+++ libetpan/src/data-types/mailsem.c	2005-03-10 14:32:31.717000768 +0100
-@@ -34,7 +34,9 @@
-  */
- 
- #include "mailsem.h"
-+#ifdef LIBETPAN_REENTRANT
- #include <semaphore.h>
-+#endif
- #include <stdlib.h>
- #include <stdio.h>
- #include <sys/stat.h>
-@@ -50,6 +52,7 @@
- 
- struct mailsem * mailsem_new(void)
- {
-+#ifdef LIBETPAN_REENTRANT
-   struct mailsem * sem;
-   int r;
-   
-@@ -82,11 +85,13 @@
-   return sem;
-   
-  err:
-+#endif
-   return NULL;
- }
- 
- void mailsem_free(struct mailsem * sem)
- {
-+#ifdef LIBETPAN_REENTRANT
-   if (sem->sem_kind == SEMKIND_SEMOPEN) {
-     char name[SEMNAME_LEN];
-     
-@@ -101,14 +106,23 @@
-     free(sem->sem_sem);
-   }
-   free(sem);
-+#endif
- }
- 
- int mailsem_up(struct mailsem * sem)
- {
-+#ifdef LIBETPAN_REENTRANT
-   return sem_wait((sem_t *) sem->sem_sem);
-+#else
-+  return 0;
-+#endif
- }
- 
- int mailsem_down(struct mailsem * sem)
- {
-+#ifdef LIBETPAN_REENTRANT
-   return sem_post((sem_t *) sem->sem_sem);
-+#else
-+  return 0;
-+#endif
- }
diff --git a/packages/libetpan/libetpan_0.36.bb b/packages/libetpan/libetpan_0.36.bb
deleted file mode 100644
index 1a6c989d5a..0000000000
--- a/packages/libetpan/libetpan_0.36.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-DESCRIPTION = "libetpan is a library for communicating with mail and news servers using \
-SMTP, POP, IMAP and NNTP"
-SECTION = "libs"
-DEPENDS = "openssl"
-PV = "0.36"
-PR = "r3"
-S = "${WORKDIR}/libetpan"
-TAG="rel-0-36"
-LICENSE = "BSD"
-SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/libetpan;tag=${TAG};module=libetpan \
-          file://etpan_configure.patch;patch=1 \
-          file://reentrant.patch;patch=1 \
-          file://gnutls.patch;patch=1 "
-
-inherit autotools pkgconfig gettext
-
-EXTRA_OECONF = "--with-openssl=${STAGING_LIBDIR}/.. --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
new file mode 100644
index 0000000000..51757a7265
--- /dev/null
+++ b/packages/libetpan/libetpan_0.43.bb
@@ -0,0 +1,21 @@
+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.38/.mtn2git_empty b/packages/matchbox-applet-tasks/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/libetpan/libetpan-0.38/.mtn2git_empty
+++ b/packages/matchbox-applet-tasks/.mtn2git_empty
diff --git a/packages/matchbox-applet-tasks/mb-applet-tasks_1.0.0.bb b/packages/matchbox-applet-tasks/mb-applet-tasks_1.0.0.bb
new file mode 100644
index 0000000000..f483d6ec43
--- /dev/null
+++ b/packages/matchbox-applet-tasks/mb-applet-tasks_1.0.0.bb
@@ -0,0 +1,32 @@
+DESCRIPTION = "Tasks applet switcher for matchbox"
+LICENSE = "GPLv2"
+MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>"
+DEPENDS = "gtk+ libwnck libmatchbox"
+
+PR = "r1"
+
+CFLAGS += "-I${STAGING_INCDIR} \
+	   -I${STAGING_INCDIR}/gtk-2.0 \
+	   -I${STAGING_INCDIR}/glib-2.0 \
+	   -I${STAGING_INCDIR}/freetype2 \
+	   -I${STAGING_INCDIR}/atk-1.0 \
+	   -I${STAGING_INCDIR}/libwnck-1.0 \	
+	   -I${STAGING_LIBDIR}/gtk-2.0/include \
+	   -I${STAGING_INCDIR}/cairo \
+	   -DWNCK_I_KNOW_THIS_IS_UNSTABLE"
+
+SRC_URI = "http://mail.pdaxrom.org/1.1.0beta1/src/${P}.tar.bz2"
+
+do_install() {
+install -d ${D}/${datadir}/applications
+install -d ${D}/${bindir}
+
+install -m 755 mb-applet-tasks ${D}/${bindir}
+install -m 644 mb-applet-tasks.desktop ${D}/${datadir}/applications
+}
+
+
+
+
+
+
diff --git a/packages/mplayer/mplayer-atty_1.1.5.bb b/packages/mplayer/mplayer-atty_1.1.5.bb
index 5a8194b388..cfc8c7a40a 100644
--- a/packages/mplayer/mplayer-atty_1.1.5.bb
+++ b/packages/mplayer/mplayer-atty_1.1.5.bb
@@ -2,11 +2,12 @@ DESCRIPTION = "Open Source multimedia player."
 SECTION = "opie/multimedia"
 PRIORITY = "optional"
 HOMEPAGE = "http://atty.skr.jp/?Zaurus%2Fmplayer"
-DEPENDS = "virtual/libsdl freetype libmad libogg libvorbis zlib libpng jpeg alsa-lib"
+DEPENDS = "virtual/libsdl freetype libmad libogg libvorbis zlib libpng jpeg alsa-lib mplayer-common"
+RDEPENDS = "mplayer-common"
 LICENSE = "GPL"
 RCONFLICTS = "mplayer"
 MAINTAINER = "Graeme Gregory <dp@xora.org.uk>"
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "http://www.xora.org.uk/oe/mplayer-${PV}.tar.gz \
 	   file://Makefile.patch;patch=1;pnum=0 \
diff --git a/packages/mplayer/mplayer-common.bb b/packages/mplayer/mplayer-common.bb
new file mode 100644
index 0000000000..93ddc975b9
--- /dev/null
+++ b/packages/mplayer/mplayer-common.bb
@@ -0,0 +1,31 @@
+#
+# Copyright Matthias Hentges <devel@hentges.net> (c) 2006
+# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license)
+#
+# Filename: mplayer-common.bb
+# Date: 26-Mar-06
+
+DESCRIPTION = "Preconfigured mplayer preferences"
+MAINTAINER = "Matthias 'CoreDump' Hentges <oe@hentges.net>"
+HOMEPAGE = "http://www.hentges.net/misc/openzaurus/index.shtml"
+
+######################################################################################
+
+PV = "0.0.1"
+PR = "r0"
+
+######################################################################################
+
+SRC_URI = "file://mplayer.conf"
+
+######################################################################################
+
+FILES_${PN} = "/usr/etc/mplayer"
+
+######################################################################################
+
+do_install() {
+	install -d "${D}/usr/etc/mplayer"
+	
+	install -m 0644 ${WORKDIR}/mplayer.conf "${D}/usr/etc/mplayer"
+}
diff --git a/packages/mplayer/mplayer-common/.mtn2git_empty b/packages/mplayer/mplayer-common/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/mplayer/mplayer-common/.mtn2git_empty
diff --git a/packages/mplayer/mplayer-common/mplayer.conf b/packages/mplayer/mplayer-common/mplayer.conf
new file mode 100644
index 0000000000..92aeb15f3b
--- /dev/null
+++ b/packages/mplayer/mplayer-common/mplayer.conf
@@ -0,0 +1,15 @@
+
+# You probably shouldn't touch these
+ac=mad,
+ao=oss,
+
+# Required on SL-Cxxxx for correct rotation in the *VT*,
+# breaks rotation in X!
+# vf=rotate=1
+
+# Enable fullscreen display by default
+# fs=true
+
+# Drop frames to keep audio and video in sync
+framedrop=true
+
diff --git a/packages/mplayer/mplayer_1.0pre7.bb b/packages/mplayer/mplayer_1.0pre7.bb
index bb9f540ab5..25194beec9 100644
--- a/packages/mplayer/mplayer_1.0pre7.bb
+++ b/packages/mplayer/mplayer_1.0pre7.bb
@@ -2,7 +2,8 @@ DESCRIPTION = "Open Source multimedia player."
 SECTION = "opie/multimedia"
 PRIORITY = "optional"
 HOMEPAGE = "http://www.mplayerhq.hu/"
-DEPENDS = "virtual/libsdl libmad libogg libvorbis zlib libpng jpeg"
+DEPENDS = "virtual/libsdl libmad libogg libvorbis zlib libpng jpeg mplayer-common"
+RDEPENDS = "mplayer-common"
 LICENSE = "GPL"
 SRC_URI = "http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-${PV}.tar.bz2 \
            file://Makefile.patch;patch=1 \
@@ -14,7 +15,7 @@ SRC_URI = "http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-${PV}.tar.bz2 \
 
 MAINTAINER="Graeme Gregory <dp@xora.org.uk>"
 RCONFLICTS_${PN} = "mplayer-atty"
-PR = "r2"
+PR = "r3"
 
 PARALLEL_MAKE = ""
 
diff --git a/packages/pango/pango_1.12.0.bb b/packages/pango/pango_1.12.0.bb
index 4b6459e034..e06e659b7b 100644
--- a/packages/pango/pango_1.12.0.bb
+++ b/packages/pango/pango_1.12.0.bb
@@ -1,7 +1,7 @@
 LICENSE = "LGPL"
 SECTION = "x11/libs"
 # Xt needed to keep autoconf's check for X11 happy
-DEPENDS = "glib-2.0 fontconfig freetype zlib x11 libxft xt gtk-doc cairo"
+DEPENDS = "glib-2.0 fontconfig freetype zlib libx11 libxft libxt gtk-doc cairo"
 DESCRIPTION = "The goal of the Pango project is to provide an \
 Open Source framework for the layout and rendering of \
 internationalized text."
diff --git a/packages/upnp/.mtn2git_empty b/packages/upnp/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/upnp/.mtn2git_empty
diff --git a/packages/upnp/libupnp_1.3.1.bb b/packages/upnp/libupnp_1.3.1.bb
new file mode 100644
index 0000000000..80f0999dd6
--- /dev/null
+++ b/packages/upnp/libupnp_1.3.1.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "The Linux* SDK for UPnP* Devices (libupnp) provides developers with an API and open source code for building control points, devices, and bridges that are compliant with Version 1.0 of the Universal Plug and Play Device Architecture Specification."
+HOMEPAGE = "http://upnp.sourceforge.net/"
+MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>"
+LICENSE = "BSD"
+
+LEAD_SONAME = "libupnp"
+SRC_URI = "${SOURCEFORGE_MIRROR}/upnp/${P}.tar.gz"
+inherit autotools pkgconfig
+
+
+
+do_stage() {
+autotools_stage_all
+}
+
+
diff --git a/packages/xlibs/libx11-native_6.2.1.bb b/packages/xlibs/libx11-native_6.2.1.bb
index b1fd2aa0db..f27ab343a4 100644
--- a/packages/xlibs/libx11-native_6.2.1.bb
+++ b/packages/xlibs/libx11-native_6.2.1.bb
@@ -1,5 +1,5 @@
 SECTION = "x11/base"
 include libx11_${PV}.bb
 inherit native
-DEPENDS = "xproto-native xextensions-native xau-native xtrans-native libxdmcp-native"
+DEPENDS = "xproto-native xextensions-native libxau-native xtrans-native libxdmcp-native"
 PROVIDES = ""
diff --git a/packages/xlibs/libx11-native_cvs.bb b/packages/xlibs/libx11-native_cvs.bb
index 161c070899..5b221122d3 100644
--- a/packages/xlibs/libx11-native_cvs.bb
+++ b/packages/xlibs/libx11-native_cvs.bb
@@ -1,5 +1,5 @@
 SECTION = "x11/base"
 include libx11_cvs.bb
 inherit native
-DEPENDS = "xproto-native xextensions-native xau-native xtrans-native libxdmcp-native"
+DEPENDS = "xproto-native xextensions-native libxau-native xtrans-native libxdmcp-native"
 PROVIDES = ""
diff --git a/packages/xlibs/libxext-native_cvs.bb b/packages/xlibs/libxext-native_cvs.bb
index 296a741ebf..295bae2584 100644
--- a/packages/xlibs/libxext-native_cvs.bb
+++ b/packages/xlibs/libxext-native_cvs.bb
@@ -1,5 +1,5 @@
 SECTION = "unknown"
 include libxext_${PV}.bb
 inherit native
-DEPENDS = "x11-native xextensions-native"
+DEPENDS = "libx11-native xextensions-native"
 PROVIDES = ""
diff --git a/packages/zaurusd/files/.mtn2git_empty b/packages/zaurusd/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/zaurusd/files/.mtn2git_empty
diff --git a/packages/zaurusd/files/mbinputmgr-honor-user-prefs.patch b/packages/zaurusd/files/mbinputmgr-honor-user-prefs.patch
new file mode 100644
index 0000000000..f4ef7c5aee
--- /dev/null
+++ b/packages/zaurusd/files/mbinputmgr-honor-user-prefs.patch
@@ -0,0 +1,65 @@
+--- zaurusd/scripts/zaurus-hinge.in	2006-03-24 18:23:15.000000000 +0100
++++ zaurusd/scripts/zaurus-hinge	2006-03-24 18:33:24.480748696 +0100
+@@ -18,6 +18,10 @@
+    exit 1
+ fi
+ 
++panel_user="`ps aux|grep matchbox-panel|grep -v grep | awk '{print $2}'`"
++
++
++
+ STATE=$1
+ 
+ if [ $STATE = "3" ]; then
+@@ -29,8 +33,21 @@
+ fi
+ 
+ if [ $STATE = "0" ]; then
+-  #echo "lanscape"
+-  killproc @bindir@/mbinputmgr
++  #echo "landscape"
++
++  # As matchbox-panel updates its written configuration right after an applet dies / is killed, we can not be sure
++  # whether the user had gpe-panel in his preferences after rotating to portrait. And since there is a slim chance
++  # that a user changes his preferences from time to time, we renew that dumped configuration every now and then ;)
++
++  if ! test -e "/tmp/gpe-panel.session-$panel_user"
++  then
++    cp /home/$panel_user/.matchbox/mbdock.session "/tmp/gpe-panel.session-$panel_user"
++    cat "/tmp/gpe-panel.session-$panel_user" | grep -q panel || killproc @bindir@/mbinputmgr
++  else
++    cat "/tmp/gpe-panel.session-$panel_user" | grep -q panel || killproc @bindir@/mbinputmgr
++    rm "/tmp/gpe-panel.session-$panel_user"
++  fi
++   
+   # urg mbinputmgr should kill below
+   killproc @bindir@/matchbox-keyboard
+   killproc @bindir@/matchbox-stroke
+@@ -47,8 +64,25 @@
+   fi
+   # just to be extra safe
+   sleep 1
+-  if [ -x @bindir@/mbinputmgr ]; then
+-    @bindir@/mbinputmgr &
++      
++  echo "panel_user = [$panel_user]"
++
++  if ! test -e "/tmp/gpe-panel.session-$panel_user"
++  then
++    cp /home/$panel_user/.matchbox/mbdock.session "/tmp/gpe-panel.session-$panel_user"
++  else
++    rm "/tmp/gpe-panel.session-$panel_user"
+   fi
++  
++  if test -n "$panel_user"
++  then
++    echo "Running panel as user [$panel_user]"
++    ps aux | grep "$panel_user" | grep -q "mbinputmgr " || su $panel_user -c @bindir@/mbinputmgr &
++  else
++     # A failsafe can't hurt
++     echo "Warning: Running mbinputmgr as root!"
++     ps aux | grep -q "mbinputmgr " || @bindir@/mbinputmgr &
++  fi
++
+   exit 0
+ fi
diff --git a/packages/zaurusd/zaurusd_svn.bb b/packages/zaurusd/zaurusd_svn.bb
index d36fc1c118..4f20dc23c5 100644
--- a/packages/zaurusd/zaurusd_svn.bb
+++ b/packages/zaurusd/zaurusd_svn.bb
@@ -3,10 +3,11 @@ SECTION = "base"
 MAINTAINER = "Richard Purdie <rpurdie@openedhand.com>"
 DESCRIPTION = "Daemon to handle device specifc features."
 PV = "0.0+svn${SRCDATE}"
-PR = "r0"
+PR = "r1"
 DEPENDS = "tslib"
 
-SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=zaurusd;proto=http"
+SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=zaurusd;proto=http \
+	   file://mbinputmgr-honor-user-prefs.patch;patch=1"
 S = "${WORKDIR}/${PN}"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"