merge of d666453b1d27ca8088768cfc910fd4bd31f2682c

     and ec2b8ee274a7ff882306f13cd1a98ad612a9b85d

39 files changed, 283 insertions, 814 deletions

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/libschedule/libschedule_0.13.bb b/packages/libschedule/libschedule_0.13.bb
deleted file mode 100644
index feba11c9df..0000000000
--- a/packages/libschedule/libschedule_0.13.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-LICENSE = "LGPL"
-PR = "r1"
-DESCRIPTION = "RTC alarm handling library for GPE"
-SECTION = "gpe/libs"
-PRIORITY = "optional"
-MAINTAINER = "Philip Blundell <pb@handhelds.org>"
-DEPENDS = "glib-2.0"
-
-inherit pkgconfig gpe
-
-headers = "schedule.h"
-
-do_stage () {
-	oe_libinstall -so libschedule ${STAGING_LIBDIR}
-
-	mkdir -p ${STAGING_INCDIR}/gpe
-	for h in ${headers}; do
-		install -m 0644 ${S}/gpe/$h ${STAGING_INCDIR}/gpe/$h
-	done
-}
-
-do_install () {
-	gpe_do_install
-	oe_runmake PREFIX=${prefix} DESTDIR=${D} install-devel
-}
diff --git a/packages/libschedule/libschedule_0.16.bb b/packages/libschedule/libschedule_0.16.bb
new file mode 100644
index 0000000000..ab71dd4521
--- /dev/null
+++ b/packages/libschedule/libschedule_0.16.bb
@@ -0,0 +1,15 @@
+LICENSE = "LGPL"
+PR = "r0"
+DESCRIPTION = "RTC alarm handling library for GPE"
+SECTION = "gpe/libs"
+PRIORITY = "optional"
+DEPENDS = "glib-2.0 sqlite"
+GPE_TARBALL_SUFFIX = "bz2"
+
+inherit autotools pkgconfig gpe 
+
+
+do_stage () {
+autotools_stage_all
+}
+
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/libetpan/libetpan-0.38/.mtn2git_empty b/packages/mplayer/mplayer-common/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/libetpan/libetpan-0.38/.mtn2git_empty
+++ 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/obexftp/obexftp-0.10.3/.mtn2git_empty b/packages/obexftp/files/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/obexftp/obexftp-0.10.3/.mtn2git_empty
+++ b/packages/obexftp/files/.mtn2git_empty
diff --git a/packages/obexftp/obexftp-0.10.3/m4.patch b/packages/obexftp/files/m4.patch
index 07c5eedcd7..07c5eedcd7 100644
--- a/packages/obexftp/obexftp-0.10.3/m4.patch
+++ b/packages/obexftp/files/m4.patch
diff --git a/packages/obexftp/obexftp_0.10.3.bb b/packages/obexftp/obexftp_0.10.3.bb
deleted file mode 100644
index c4285c5c9c..0000000000
--- a/packages/obexftp/obexftp_0.10.3.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-DESCRIPTION = "OBEX Ftp Client"
-SECTION = "console/network"
-LICENSE = "GPL"
-PRIORITY = "optional"
-DEPENDS = "openobex libgsm"
-PR = "r1"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/openobex/obexftp-${PV}.tar.gz \
-	   file://m4.patch;patch=1"
-
-inherit autotools 
-
-#EXTRA_OEMAKE = "'SUBDIRS=bfb cobexbfb cobexpe obexftp apps vmo doc'"
-EXTRA_OEMAKE = "'SUBDIRS=bfb cobexbfb cobexpe obexftp apps vmo'"
diff --git a/packages/obexftp/obexftp_0.19.bb b/packages/obexftp/obexftp_0.19.bb
new file mode 100644
index 0000000000..e5479c14de
--- /dev/null
+++ b/packages/obexftp/obexftp_0.19.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "OBEX Ftp Client based on openobex."
+SECTION = "console/network"
+HOMEPAGE = "http://openobex.triq.net"
+LICENSE = "GPL"
+DEPENDS = "openobex libgsm"
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/openobex/obexftp-${PV}.tar.gz \
+	   file://m4.patch;patch=1"
+
+inherit autotools 
+
+EXTRA_OECONF = " --enable-bluetooth --disable-swig --disable-perl --disable-python --disable-tcl --disable-builddocs"
+
+do_stage() {
+	autotools_stage_all
+}
+	
diff --git a/packages/openobex-apps/openobex-apps-1.0.0/gcc34.patch b/packages/openobex-apps/openobex-apps-1.0.0/gcc34.patch
deleted file mode 100644
index 6dac1725b6..0000000000
--- a/packages/openobex-apps/openobex-apps-1.0.0/gcc34.patch
+++ /dev/null
@@ -1,260 +0,0 @@
-diff -Naur openobex-apps-1.0.0-clean/src/obex_put_common.c openobex-apps-1.0.0/src/obex_put_common.c
---- openobex-apps-1.0.0-clean/src/obex_put_common.c	2002-12-01 18:34:41.000000000 +0100
-+++ openobex-apps-1.0.0/src/obex_put_common.c	2004-05-12 12:57:37.000000000 +0200
-@@ -82,7 +82,7 @@
- 			break;
- 		
- 		default:
--			printf(__FUNCTION__ "() Skipped header %02x\n", hi);
-+			printf("%s() Skipped header %02x\n", __func__,  hi);
- 		}
- 	}
- 	if(!body)	{
-@@ -123,7 +123,7 @@
- 		OBEX_ObjectSetRsp(object, OBEX_RSP_SUCCESS, OBEX_RSP_SUCCESS);
- 		break;
- 	default:
--		printf(__FUNCTION__ "() Denied %02x request\n", cmd);
-+		printf("%s() Denied %02x request\n", __func__,  cmd);
- 		OBEX_ObjectSetRsp(object, OBEX_RSP_NOT_IMPLEMENTED, OBEX_RSP_NOT_IMPLEMENTED);
- 		break;
- 	}
-diff -Naur openobex-apps-1.0.0-clean/src/obex_test_cable.h openobex-apps-1.0.0/src/obex_test_cable.h
---- openobex-apps-1.0.0-clean/src/obex_test_cable.h	2002-12-01 18:34:41.000000000 +0100
-+++ openobex-apps-1.0.0/src/obex_test_cable.h	2004-05-12 13:23:11.000000000 +0200
-@@ -1,16 +1,16 @@
- /*********************************************************************
-- *                
-+ *
-  * Filename:      obex_test_cable.h
-- * Version:       
-- * Description:   
-+ * Version:
-+ * Description:
-  * Status:        Experimental.
-  * Author:        Pontus Fuchs <pontus.fuchs@tactel.se>
-  * Created at:    Wed Nov 17 22:05:16 1999
-  * Modified at:   Sun Aug 13 10:55:20 PM CEST 2000
-  * Modified by:   Pontus Fuchs <pontus.fuchs@tactel.se>
-- * 
-+ *
-  *     Copyright (c) 1999, 2000 Pontus Fuchs, All Rights Reserved.
-- *      
-+ *
-  *     This library is free software; you can redistribute it and/or
-  *     modify it under the terms of the GNU Lesser General Public
-  *     License as published by the Free Software Foundation; either
-@@ -23,9 +23,9 @@
-  *
-  *     You should have received a copy of the GNU Lesser General Public
-  *     License along with this library; if not, write to the Free Software
-- *     Foundation, Inc., 59 Temple Place, Suite 330, Boston, 
-+ *     Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-  *     MA  02111-1307  USA
-- *     
-+ *
-  ********************************************************************/
- 
- #ifndef OBEX_TEST_CABLE_H
-@@ -38,7 +38,7 @@
- #include <openobex/obex.h>
- 
- #ifdef CABLE_DEBUG
--#define CDEBUG(args...) printf(__FUNCTION__ "() " args)
-+#define CDEBUG(args...) printf("%s() ", __func__, args)
- #else
- #define CDEBUG(args...)
- #endif
-diff -Naur openobex-apps-1.0.0-clean/src/obex_test_cable.h~ openobex-apps-1.0.0/src/obex_test_cable.h~
---- openobex-apps-1.0.0-clean/src/obex_test_cable.h~	1970-01-01 01:00:00.000000000 +0100
-+++ openobex-apps-1.0.0/src/obex_test_cable.h~	2004-05-12 13:22:48.000000000 +0200
-@@ -0,0 +1,66 @@
-+/*********************************************************************
-+ *
-+ * Filename:      obex_test_cable.h
-+ * Version:
-+ * Description:
-+ * Status:        Experimental.
-+ * Author:        Pontus Fuchs <pontus.fuchs@tactel.se>
-+ * Created at:    Wed Nov 17 22:05:16 1999
-+ * Modified at:   Sun Aug 13 10:55:20 PM CEST 2000
-+ * Modified by:   Pontus Fuchs <pontus.fuchs@tactel.se>
-+ *
-+ *     Copyright (c) 1999, 2000 Pontus Fuchs, All Rights Reserved.
-+ *
-+ *     This library is free software; you can redistribute it and/or
-+ *     modify it under the terms of the GNU Lesser General Public
-+ *     License as published by the Free Software Foundation; either
-+ *     version 2 of the License, or (at your option) any later version.
-+ *
-+ *     This library is distributed in the hope that it will be useful,
-+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *     Lesser General Public License for more details.
-+ *
-+ *     You should have received a copy of the GNU Lesser General Public
-+ *     License along with this library; if not, write to the Free Software
-+ *     Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *     MA  02111-1307  USA
-+ *
-+ ********************************************************************/
-+
-+#ifndef OBEX_TEST_CABLE_H
-+#define OBEX_TEST_CABLE_H
-+
-+#define CABLE_DEBUG 1
-+
-+
-+#include <termios.h>
-+#include <openobex/obex.h>
-+
-+#ifdef CABLE_DEBUG
-+#define CDEBUG(args...) printf("%s() " __func__, args)
-+#else
-+#define CDEBUG(args...)
-+#endif
-+
-+struct cobex_context
-+{
-+	const char *portname;
-+	int ttyfd;
-+	char inputbuf[500];
-+	struct termios oldtio, newtio;
-+	int r320;
-+};
-+
-+/* User function */
-+struct cobex_context *cobex_open(const char *port, int r320);
-+void cobex_close(struct cobex_context *gt);
-+int cobex_do_at_cmd(struct cobex_context *gt, char *cmd, char *rspbuf, int rspbuflen, int timeout);
-+
-+/* Callbacks */
-+int cobex_handle_input(obex_t *handle, void * userdata, int timeout);
-+int cobex_write(obex_t *self, void * userdata, uint8_t *buffer, int length);
-+int cobex_connect(obex_t *handle, void * userdata);
-+int cobex_disconnect(obex_t *handle, void * userdata);
-+
-+#endif
-diff -Naur openobex-apps-1.0.0-clean/src/obex_test_client.c openobex-apps-1.0.0/src/obex_test_client.c
---- openobex-apps-1.0.0-clean/src/obex_test_client.c	2002-12-01 18:34:41.000000000 +0100
-+++ openobex-apps-1.0.0/src/obex_test_client.c	2004-05-12 13:07:24.000000000 +0200
-@@ -370,13 +370,13 @@
- 
- 	while(OBEX_ObjectGetNextHeader(handle, object, &hi, &hv, &hlen))	{
- 		if(hi == OBEX_HDR_BODY)	{
--		printf(__FUNCTION__ "() Found body\n");
-+		printf("%s() Found body\n", __func__);
- 			body = hv.bs;
- 			body_len = hlen;
- 			break;
- 		}
- 		else	{
--			printf(__FUNCTION__ "() Skipped header %02x\n", hi);
-+			printf("%s() Skipped header %02x\n", __func__,  hi);
- 		}
- 	}
- 
-diff -Naur openobex-apps-1.0.0-clean/src/obex_test_server.c openobex-apps-1.0.0/src/obex_test_server.c
---- openobex-apps-1.0.0-clean/src/obex_test_server.c	2002-12-01 18:34:41.000000000 +0100
-+++ openobex-apps-1.0.0/src/obex_test_server.c	2004-05-12 13:07:33.000000000 +0200
-@@ -54,17 +54,17 @@
- 	char *name = NULL;
- 	char *namebuf = NULL;
- 
--	printf(__FUNCTION__ "()\n");
-+	printf("%s()\n", __func__);
- 
- 	while(OBEX_ObjectGetNextHeader(handle, object, &hi, &hv, &hlen))	{
- 		switch(hi)	{
- 		case OBEX_HDR_BODY:
--			printf(__FUNCTION__ "() Found body\n");
-+			printf("%s() Found body\n", __func__);
- 			body = hv.bs;
- 			body_len = hlen;
- 			break;
- 		case OBEX_HDR_NAME:
--			printf(__FUNCTION__ "() Found name\n");
-+			printf("%s() Found name\n", __func__);
- 			if( (namebuf = malloc(hlen / 2)))	{
- 				OBEX_UnicodeToChar(namebuf, hv.bs, hlen);
- 				name = namebuf;
-@@ -72,7 +72,7 @@
- 			break;
- 		
- 		default:
--			printf(__FUNCTION__ "() Skipped header %02x\n", hi);
-+			printf("%s() Skipped header %02x\n", __func__,  hi);
- 		}
- 	}
- 	if(!body)	{
-@@ -103,12 +103,12 @@
- 	char *name = NULL;
- 	char *namebuf = NULL;
- 
--	printf(__FUNCTION__ "()\n");
-+	printf("%s()\n", __func__);
- 
- 	while(OBEX_ObjectGetNextHeader(handle, object, &hi, &hv, &hlen))	{
- 		switch(hi)	{
- 		case OBEX_HDR_NAME:
--			printf(__FUNCTION__ "() Found name\n");
-+			printf("%s() Found name\n", __func__);
- 			if( (namebuf = malloc(hlen / 2)))	{
- 				OBEX_UnicodeToChar(namebuf, hv.bs, hlen);
- 				name = namebuf;
-@@ -116,16 +116,16 @@
- 			break;
- 		
- 		default:
--			printf(__FUNCTION__ "() Skipped header %02x\n", hi);
-+			printf("%s() Skipped header %02x\n", __func__,  hi);
- 		}
- 	}
- 
- 	if(!name)	{
--		printf(__FUNCTION__ "() Got a GET without a name-header!\n");
-+		printf("%s() Got a GET without a name-header!\n", __func__);
- 		OBEX_ObjectSetRsp(object, OBEX_RSP_NOT_FOUND, OBEX_RSP_NOT_FOUND);
- 		return;
- 	}
--	printf(__FUNCTION__ "() Got a request for %s\n", name);
-+	printf("%s() Got a request for %s\n", __func__,  name);
- 
- 	buf = easy_readfile(name, &file_size);
- 	if(buf == NULL) {
-@@ -154,7 +154,7 @@
- 
- 	const uint8_t *who = NULL;
- 	int who_len = 0;
--	printf(__FUNCTION__ "()\n");
-+	printf("%s()\n", __func__);
- 
- 	while(OBEX_ObjectGetNextHeader(handle, object, &hi, &hv, &hlen))	{
- 		if(hi == OBEX_HDR_WHO)	{
-@@ -162,7 +162,7 @@
- 			who_len = hlen;
- 		}
- 		else	{
--			printf(__FUNCTION__ "() Skipped header %02x\n", hi);
-+			printf("%s() Skipped header %02x\n", __func__,  hi);
- 		}
- 	}
- 	if (who_len == 6)	{
-@@ -199,7 +199,7 @@
- 		OBEX_ObjectSetRsp(object, OBEX_RSP_CONTINUE, OBEX_RSP_SUCCESS);
- 		break;
- 	default:
--		printf(__FUNCTION__ "() Denied %02x request\n", cmd);
-+		printf("%s() Denied %02x request\n", __func__,  cmd);
- 		OBEX_ObjectSetRsp(object, OBEX_RSP_NOT_IMPLEMENTED, OBEX_RSP_NOT_IMPLEMENTED);
- 		break;
- 	}
-@@ -224,7 +224,7 @@
- 		break;
- 
- 	default:
--		printf(__FUNCTION__ "() Command (%02x) has now finished\n", obex_cmd);
-+		printf("%s() Command (%02x) has now finished\n", __func__,  obex_cmd);
- 		break;
- 	}
- }
diff --git a/packages/openobex-apps/openobex-apps-1.0.0/m4.patch b/packages/openobex-apps/openobex-apps-1.0.0/m4.patch
deleted file mode 100644
index 249074bf60..0000000000
--- a/packages/openobex-apps/openobex-apps-1.0.0/m4.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- /dev/null	2003-09-23 18:19:32.000000000 -0400
-+++ openobex-apps-1.0.0/m4/openobex.m4	2004-01-26 18:48:04.000000000 -0500
-@@ -0,0 +1,56 @@
-+dnl Check for openobex library
-+dnl Written by Pontus Fuchs 2000-08-18
-+dnl Version checking fixed by Christian W. Zuckschwerdt 2002-10-17
-+
-+AC_DEFUN([AM_PATH_OPENOBEX], [
-+	AC_PATH_PROG(OPENOBEX_CONFIG, openobex-config, no)
-+
-+	if test "$OPENOBEX_CONFIG" = "no" ; then
-+		AC_MSG_ERROR(openobex-config not found. Pehaps openobex is not installed.)
-+	fi
-+
-+	min_obex_version=ifelse([$1], ,0.9.6,$1)
-+	AC_MSG_CHECKING(for openobex - version >= $min_obex_version)
-+
-+	OPENOBEX_CFLAGS=`$OPENOBEX_CONFIG --cflags`
-+	OPENOBEX_LIBS=`$OPENOBEX_CONFIG --libs`
-+
-+	obex_config_version=`$OPENOBEX_CONFIG --version`
-+
-+	obex_config_major_version=`$OPENOBEX_CONFIG --version | \
-+		sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-+	obex_config_minor_version=`$OPENOBEX_CONFIG --version | \
-+		sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-+	obex_config_micro_version=`$OPENOBEX_CONFIG --version | \
-+		sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-+
-+	obex_req_major_version=`echo $min_obex_version | \
-+		sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-+	obex_req_minor_version=`echo $min_obex_version | \
-+		sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-+	obex_req_micro_version=`echo $min_obex_version | \
-+		sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-+
-+
-+	if test $obex_req_major_version -lt $obex_config_major_version ; then
-+       		obex_config_version_ok="yes"
-+       	fi
-+	if test $obex_req_major_version -eq $obex_config_major_version ; then
-+		if test $obex_req_minor_version -lt $obex_config_minor_version ; then
-+       			obex_config_version_ok="yes"
-+	       	fi
-+		if test $obex_req_minor_version -eq $obex_config_minor_version ; then
-+			if test $obex_req_micro_version -le $obex_config_micro_version ; then
-+				obex_config_version_ok="yes"
-+			fi
-+		fi
-+	fi
-+	
-+	if test "$obex_config_version_ok" != "yes" ; then
-+		AC_MSG_ERROR(Installed openobex library too old ($obex_config_version))
-+	fi
-+
-+	AC_SUBST(OPENOBEX_CFLAGS)
-+	AC_SUBST(OPENOBEX_LIBS)
-+	AC_MSG_RESULT(yes)
-+])
diff --git a/packages/openobex-apps/openobex-apps_1.0.0.bb b/packages/openobex-apps/openobex-apps_1.0.0.bb
deleted file mode 100644
index 5fee78ce9b..0000000000
--- a/packages/openobex-apps/openobex-apps_1.0.0.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-LICENSE = "GPL"
-DESCRIPTION = "Applications for OpenOBEX"
-SECTION = "console/network"
-PRIORITY = "optional"
-DEPENDS = "openobex"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/openobex/openobex-apps-${PV}.tar.gz \
-	   file://m4.patch;patch=1 \
-	   file://gcc34.patch;patch=1"
-
-inherit autotools 
-
-EXTRA_OECONF = "--disable-glibtest --with-glib-prefix=${STAGING_LIBDIR}/.."
-EXTRA_OEMAKE = "'INCLUDES='"
diff --git a/packages/openobex-apps/.mtn2git_empty b/packages/openobex/files/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/openobex-apps/.mtn2git_empty
+++ b/packages/openobex/files/.mtn2git_empty
diff --git a/packages/openobex/files/disable-cable-test.patch b/packages/openobex/files/disable-cable-test.patch
new file mode 100644
index 0000000000..95b636dd8f
--- /dev/null
+++ b/packages/openobex/files/disable-cable-test.patch
@@ -0,0 +1,16 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- openobex-1.2/apps/Makefile.am~disable-cable-test
++++ openobex-1.2/apps/Makefile.am
+@@ -6,7 +6,7 @@
+ 	obex_io.c obex_io.h \
+ 	obex_put_common.c obex_put_common.h
+ 
+-bin_PROGRAMS = irxfer obex_tcp irobex_palm3 obex_test
++bin_PROGRAMS = irxfer obex_tcp irobex_palm3
+ 
+ obex_test_SOURCES = \
+ 	obex_test.c obex_test.h \
diff --git a/packages/openobex/openobex-1.0.1/syms.patch b/packages/openobex/openobex-1.0.1/syms.patch
deleted file mode 100644
index 46eea177cf..0000000000
--- a/packages/openobex/openobex-1.0.1/syms.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Index: obex.sym
-===================================================================
-RCS file: /cvsroot/openobex/openobex/lib/src/obex.sym,v
-retrieving revision 1.7
-retrieving revision 1.8
-diff -u -r1.7 -r1.8
---- openobex/src/obex.sym	15 Nov 2002 09:14:11 -0000	1.7
-+++ openobex/src/obex.sym	30 Jan 2004 19:25:45 -0000	1.8
-@@ -1,27 +1,31 @@
- OBEX_Init
- OBEX_Cleanup
-+OBEX_SetUserData
-+OBEX_GetUserData
-+OBEX_SetUserCallBack
-+OBEX_SetTransportMTU
-+OBEX_GetFD
- OBEX_RegisterCTransport
- OBEX_SetCustomData
- OBEX_GetCustomData
- OBEX_TransportConnect
- OBEX_TransportDisconnect
- OBEX_CustomDataFeed
--OBEX_GetFD
- OBEX_HandleInput
- OBEX_ServerRegister
-+OBEX_ServerAccept
- OBEX_Request
- OBEX_CancelRequest
--OBEX_SetUserData
--OBEX_GetUserData
- OBEX_ObjectNew
- OBEX_ObjectDelete
- OBEX_ObjectAddHeader
- OBEX_ObjectGetNextHeader
--OBEX_ObjectReadStream
-+OBEX_ObjectReParseHeaders
- OBEX_ObjectSetRsp
- OBEX_ObjectGetNonHdrData
- OBEX_ObjectSetNonHdrData
- OBEX_ObjectSetHdrOffset
-+OBEX_ObjectReadStream
- OBEX_UnicodeToChar
- OBEX_CharToUnicode
- OBEX_ResponseToString
diff --git a/packages/openobex/openobex_1.0.1.bb b/packages/openobex/openobex_1.0.1.bb
deleted file mode 100644
index 221ea71d61..0000000000
--- a/packages/openobex/openobex_1.0.1.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-LICENSE = "GPL"
-DESCRIPTION = "The Openobex project aims to make an \
-open source implementation of the Object Exchange \
-(OBEX) protocol."
-SECTION = "libs"
-PR = "r4"
-
-# put openobex-config into -dev package
-FILES_${PN} = "${libdir}/lib*.so.*"
-FILES_${PN}-dev += "${bindir}"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/openobex/openobex-${PV}.tar.gz \
-	  file://syms.patch;patch=1"
-
-inherit autotools binconfig
-
-do_stage () {
-	oe_libinstall -so -C src libopenobex ${STAGING_LIBDIR}
-	ln -sf libopenobex.so ${STAGING_LIBDIR}/libopenobex-1.0.so
-	install -d ${STAGING_INCDIR}/openobex
-	install -m 0644 src/obex_const.h src/obex.h ${STAGING_INCDIR}/openobex/
-	install -d ${STAGING_DIR}/aclocal
-	install -m 0644 m4macros/openobex.m4 ${STAGING_DATADIR}/aclocal/
-}
diff --git a/packages/openobex/openobex_1.2.bb b/packages/openobex/openobex_1.2.bb
new file mode 100644
index 0000000000..61ce72663b
--- /dev/null
+++ b/packages/openobex/openobex_1.2.bb
@@ -0,0 +1,29 @@
+DESCRIPTION = "The Openobex project aims to make an \
+open source implementation of the Object Exchange \
+(OBEX) protocol."
+HOMEPAGE = "http://openobex.triq.net"
+SECTION = "libs"
+LICENSE = "GPL"
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/openobex/openobex-${PV}.tar.gz \
+           file://disable-cable-test.patch;patch=1"
+
+inherit autotools binconfig pkgconfig
+
+EXTRA_OECONF = "--enable-apps --enable-syslog --enable-dump"
+
+do_stage() {
+	oe_libinstall -so -C lib libopenobex ${STAGING_LIBDIR}
+	ln -sf libopenobex.so ${STAGING_LIBDIR}/libopenobex-1.2.so
+	install -d ${STAGING_INCDIR}/openobex
+	install -m 0644 include/*.h ${STAGING_INCDIR}/openobex/
+	install -d ${STAGING_DIR}/aclocal
+	install -m 0644 openobex.m4 ${STAGING_DATADIR}/aclocal/
+}
+
+# how to stop shlibrename from renaming -apps?
+PACKAGES = "${PN} ${PN}-dev openobex-apps"
+FILES_${PN} = "${libdir}/lib*.so.*"
+FILES_${PN}-dev += "${bindir}/openobex-config"
+FILES_${PN}-apps = "${bindir}"
diff --git a/packages/opie-bluetoothmanager/opie-bluetoothmanager.inc b/packages/opie-bluetoothmanager/opie-bluetoothmanager.inc
index f5ebf88cb2..fbc9a06625 100644
--- a/packages/opie-bluetoothmanager/opie-bluetoothmanager.inc
+++ b/packages/opie-bluetoothmanager/opie-bluetoothmanager.inc
@@ -1,7 +1,7 @@
 DESCRIPTION = "Bluetooth manager for Opie"
 SECTION = "opie/settings"
 PRIORITY = "optional"
-DEPENDS = "libopietooth1"
+DEPENDS = "libopietooth1 obexftp"
 RDEPENDS = "opie-bluepin"
 MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
@@ -10,6 +10,7 @@ APPNAME = "bluetooth-manager"
 S = "${WORKDIR}/manager"
 
 EXTRA_QMAKEVARS_POST += " INCLUDEPATH+=${STAGING_INCDIR}/opietooth "
+EXTRA_QMAKEVARS_PRE = 'LIBOBEXFTP_INC_DIR=${STAGING_INCDIR}/obexftp'
 
 inherit opie
 
diff --git a/packages/opie-bluetoothmanager/opie-bluetoothmanager_1.2.1.bb b/packages/opie-bluetoothmanager/opie-bluetoothmanager_1.2.1.bb
index b048a02795..7f022404b1 100644
--- a/packages/opie-bluetoothmanager/opie-bluetoothmanager_1.2.1.bb
+++ b/packages/opie-bluetoothmanager/opie-bluetoothmanager_1.2.1.bb
@@ -1,6 +1,5 @@
 include ${PN}.inc
-    
- 
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/opietooth/manager \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \
diff --git a/packages/opie-bluetoothmanager/opie-bluetoothmanager_cvs.bb b/packages/opie-bluetoothmanager/opie-bluetoothmanager_cvs.bb
index f6040cfdd1..0dcb90892f 100644
--- a/packages/opie-bluetoothmanager/opie-bluetoothmanager_cvs.bb
+++ b/packages/opie-bluetoothmanager/opie-bluetoothmanager_cvs.bb
@@ -1,6 +1,6 @@
 include ${PN}.inc
-    
 PV = "${OPIE_CVS_PV}"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/opietooth/manager \
            ${HANDHELDS_CVS};module=opie/apps \
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/openobex-apps/openobex-apps-1.0.0/.mtn2git_empty b/packages/upnp/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/openobex-apps/openobex-apps-1.0.0/.mtn2git_empty
+++ 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/openobex/openobex-1.0.1/.mtn2git_empty b/packages/wxbase/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/openobex/openobex-1.0.1/.mtn2git_empty
+++ b/packages/wxbase/.mtn2git_empty
diff --git a/packages/wxbase/wxbase_2.6.2.bb b/packages/wxbase/wxbase_2.6.2.bb
new file mode 100644
index 0000000000..2a41fdfa65
--- /dev/null
+++ b/packages/wxbase/wxbase_2.6.2.bb
@@ -0,0 +1,54 @@
+DESCRIPTION = "wxBase is a library for programming \
+non-GUI (console) applications using the base wxWidgets functionality."
+HOMEPAGE = "http://www.wxwidgets.org/"
+LICENSE = "GPL"
+SECTION = "libs"
+PRIORITY = "optional"
+DEPENDS = "jpeg libpng zlib"
+
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/wxwindows/wxBase-${PV}.tar.bz2"
+
+S = "${WORKDIR}/wxBase-${PV}"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--enable-largefile"
+
+LEAD_SONAME = "libwx_base-2.6.so*" 
+
+do_configure() {
+       oe_runconf
+}
+
+do_stage() {
+       install -d ${STAGING_INCDIR}/wx-2.6/wx
+       cp -pr include/wx ${STAGING_INCDIR}/wx-2.6	
+       cp -pr lib/libwx* ${STAGING_LIBDIR}
+       cp -pr lib/wx     ${STAGING_LIBDIR}
+       cp -pr build/bakefiles/wxpresets/presets  ${STAGING_DATADIR}/bakefile
+       cp -pr wxwin.m4                           ${STAGING_DATADIR}/aclocal		
+       ln -sf ${STAGING_LIBDIR}/wx/config/${TARGET_PREFIX}base-ansi-release-2.6 ${STAGING_BINDIR}/wx-config
+       sed -e s,'wxconfdir=".*"','wxconfigdir="${STAGING_LIBDIR}/wx/config"', \
+           -e s,'bindir=".*"','bindir="${STAGING_BINDIR}"', \
+           -e s,'libdir=".*"','libdir="${STAGING_LIBDIR}"', \
+           -e s,'includedir=".*"','includedir="${STAGING_INCDIR}"', \
+           -i ${STAGING_LIBDIR}/wx/config/${TARGET_PREFIX}base-ansi-release-2.6	       
+}
+
+FILES_${PN} += " \
+       ${libdir}/wx/config"
+
+FILES_${PN}-dev += " \
+       ${libdir}/wx/include \
+       ${datadir}/bakefile"
+
+do_install() {
+       oe_runmake 'DESTDIR=${D}' install
+       ln -sf  ${libdir}/wx/config/${TARGET_PREFIX}base-ansi-release-2.6 ${D}${bindir}/wx-config
+       install -d ${D}${docdir}/${PN}-${PV}
+       install -m 644 -p CHANGES.txt     ${D}${docdir}/${PN}-${PV}
+       install -m 644 -p COPYING.LIB     ${D}${docdir}/${PN}-${PV}
+       install -m 644 -p LICENCE.txt     ${D}${docdir}/${PN}-${PV}
+       install -m 644 -p README.txt      ${D}${docdir}/${PN}-${PV}
+}
diff --git a/packages/wxbase/wxbase_2.7+cvs.bb b/packages/wxbase/wxbase_2.7+cvs.bb
new file mode 100644
index 0000000000..efc04b6f8c
--- /dev/null
+++ b/packages/wxbase/wxbase_2.7+cvs.bb
@@ -0,0 +1,53 @@
+DESCRIPTION = "wxBase is a library for programming \
+non-GUI (console) applications using the base wxWidgets functionality."
+HOMEPAGE = "http://www.wxwidgets.org/"
+LICENSE = "GPL"
+SECTION = "libs"
+PRIORITY = "optional"
+DEPENDS = "jpeg libpng zlib"
+
+
+SRC_URI = "http://biolpc22.york.ac.uk/pub/CVS_HEAD/wx-cvs-Gtk.tar.bz2"
+#SRC_URI = "${SOURCEFORGE_MIRROR}/wxwindows/wxBase-${PV}.tar.bz2"
+
+S = "${WORKDIR}/wxGTK"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--disable-gui --enable-largefile"
+
+LEAD_SONAME = "libwx_base-2.7*" 
+
+do_configure() {
+       oe_runconf
+}
+
+do_stage() {
+       install -d ${STAGING_INCDIR}/wx-2.7/wx
+       cp -pr include/wx ${STAGING_INCDIR}/wx-2.7	
+       cp -pr lib/libwx* ${STAGING_LIBDIR}
+       cp -pr lib/wx     ${STAGING_LIBDIR}
+       cp -pr build/bakefiles/wxpresets/presets  ${STAGING_DATADIR}/bakefile
+       cp -pr wxwin.m4                           ${STAGING_DATADIR}/aclocal
+       ln -sf ${STAGING_LIBDIR}/wx/config/${TARGET_PREFIX}base-ansi-release-2.7 ${STAGING_BINDIR}/wx-config
+       sed -e s,'wxconfdir=".*"','wxconfigdir="${STAGING_LIBDIR}/wx/config"', \
+           -e s,'bindir=".*"','bindir="${STAGING_BINDIR}"', \
+           -e s,'libdir=".*"','libdir="${STAGING_LIBDIR}"', \
+           -e s,'includedir=".*"','includedir="${STAGING_INCDIR}"', \
+           -i ${STAGING_LIBDIR}/wx/config/${TARGET_PREFIX}base-ansi-release-2.7
+}
+
+FILES_${PN} += " \
+       ${libdir}/wx/config"
+
+FILES_${PN}-dev += " \
+       ${libdir}/wx/include \
+       ${datadir}/bakefile"
+
+do_install() {
+       oe_runmake 'DESTDIR=${D}' install
+       ln -sf ${libdir}/wx/config/${TARGET_PREFIX}base-ansi-release-2.7 ${D}${bindir}/wx-config
+       install -d ${D}${docdir}/${PN}-${PV}
+       install -m 644 -p docs/*.txt      ${D}${docdir}/${PN}-${PV}
+       install -m 644 -p docs/*.htm      ${D}${docdir}/${PN}-${PV}	
+}
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 = ""