merge of '5aa5d42f826b82e5dcae45d30186d8ec6fc7f784'

     and 'c0aaf39c5aa5cccb43a4e2e31affbf6f06a62c4a'

8 files changed, 44 insertions, 18 deletions

diff --git a/packages/libesmtp/libesmtp_1.0.4.bb b/packages/libesmtp/libesmtp_1.0.4.bb
index baff0d8931..294333c579 100644
--- a/packages/libesmtp/libesmtp_1.0.4.bb
+++ b/packages/libesmtp/libesmtp_1.0.4.bb
@@ -1,22 +1,19 @@
-LICENSE = "GPL"
-SECTION = "libs"
-DEPENDS = "openssl"
 DESCRIPTION = "LibESMTP is a library to manage posting \
 (or submission of) electronic mail using SMTP to a \
-preconfigured Mail Transport Agent (MTA) such as Exim."
-FILES_libesmtp_append = " ${libdir}/esmtp-plugins"
+preconfigured Mail Transport Agent (MTA) such as Exim or PostFix."
+LICENSE = "GPL"
+SECTION = "libs/network"
+DEPENDS = "openssl"
+PR = "r1"
 
 SRC_URI = "http://www.stafford.uklinux.net/libesmtp/libesmtp-${PV}.tar.bz2"
 
-inherit autotools 
+inherit autotools binconfig
 
 EXTRA_OECONF = "--disable-isoc --with-openssl=${STAGING_LIBDIR}/.."
 
-do_stage () {
-	oe_libinstall -a -so libesmtp ${STAGING_LIBDIR}
-
-        install -d ${STAGING_INCDIR}
-	install -m 644 auth-client.h ${STAGING_INCDIR}
-	install -m 644 auth-plugin.h ${STAGING_INCDIR}
-	install -m 644 libesmtp.h ${STAGING_INCDIR}
+do_stage() {
+	autotools_stage_all
 }
+
+FILES_libesmtp_append = " ${libdir}/esmtp-plugins"
diff --git a/packages/libxine/libxine-fb_1.0.bb b/packages/libxine/libxine-fb_1.0.bb
index fd9baee512..d0f58303fa 100644
--- a/packages/libxine/libxine-fb_1.0.bb
+++ b/packages/libxine/libxine-fb_1.0.bb
@@ -3,7 +3,7 @@ This version is configured for the usage with framebuffer based environments"
 SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "GPL"
-DEPENDS = "zlib libogg tremor libmad libmodplug"
+DEPENDS = "zlib libogg tremor libmad libmodplug libpng"
 PROVIDES = "virtual/libxine"
 PR = "r1"
 
diff --git a/packages/libxine/libxine-x11_1.0.bb b/packages/libxine/libxine-x11_1.0.bb
index dfce1d32ec..692c55cf9f 100644
--- a/packages/libxine/libxine-x11_1.0.bb
+++ b/packages/libxine/libxine-x11_1.0.bb
@@ -3,7 +3,7 @@ This version is configued for the usage with X11"
 SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "GPL"
-DEPENDS = "zlib libogg libvorbis tremor libmad libmodplug esound-gpe virtual/libx11 libxext"
+DEPENDS = "zlib libogg libvorbis tremor libmad libmodplug esound-gpe virtual/libx11 libxext libpng"
 PROVIDES = "virtual/libxine"
 PR = "r0"
 
diff --git a/packages/libxine/libxine_1.1.0.bb b/packages/libxine/libxine_1.1.0.bb
index 8f172f23a7..b4ab063063 100644
--- a/packages/libxine/libxine_1.1.0.bb
+++ b/packages/libxine/libxine_1.1.0.bb
@@ -3,7 +3,7 @@ This version is configued for the usage with X11"
 SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "GPL"
-DEPENDS = "zlib libogg libvorbis tremor libmad libmodplug esound-gpe virtual/libx11 libxext"
+DEPENDS = "zlib libogg libvorbis tremor libmad libmodplug esound-gpe virtual/libx11 libxext libpng"
 PROVIDES = "virtual/libxine"
 PR = "r0"
 
diff --git a/packages/samba/samba_3.0.14a.bb b/packages/samba/samba_3.0.14a.bb
index 4daf98bfc8..ddd08c80b7 100644
--- a/packages/samba/samba_3.0.14a.bb
+++ b/packages/samba/samba_3.0.14a.bb
@@ -1,4 +1,4 @@
-PR = "r14"
+PR = "r15"
 
 SRC_URI = "http://us2.samba.org/samba/ftp/stable/samba-${PV}.tar.gz \
 	   file://configure.patch;patch=1 \
@@ -49,6 +49,7 @@ PACKAGES =+ "swat"
 
 FILES_swat = "${sbindir}/swat ${datadir}/swat ${libdir}/*.msg"
 FILES_${PN} += "${libdir}/vfs/*.so ${libdir}/charset/*.so ${libdir}/*.dat"
+FILES_${PN}-dbg += "${libdir}/vfs/.debug/*.so ${libdir}/charset/.debug/*.so"
 #
 # bug fix for samba.inc:
 FILES_cifs-doc = "${mandir}/man8/mount.cifs.8"
diff --git a/packages/samba/samba_3.0.20.bb b/packages/samba/samba_3.0.20.bb
index 7f5bd3dffa..088c167cb1 100644
--- a/packages/samba/samba_3.0.20.bb
+++ b/packages/samba/samba_3.0.20.bb
@@ -1,4 +1,4 @@
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "http://us2.samba.org/samba/ftp/stable/samba-${PV}.tar.gz \
 	   file://configure.patch;patch=1 \
@@ -49,6 +49,7 @@ PACKAGES =+ "swat"
 
 FILES_swat = "${sbindir}/swat ${datadir}/swat ${libdir}/*.msg"
 FILES_${PN} += "${libdir}/vfs/*.so ${libdir}/charset/*.so ${libdir}/*.dat"
+FILES_${PN}-dbg += "${libdir}/vfs/.debug/*.so ${libdir}/charset/.debug/*.so"
 #
 # bug fix for samba.inc:
 FILES_cifs-doc = "${mandir}/man8/mount.cifs.8"
diff --git a/packages/zsafe/.mtn2git_empty b/packages/zsafe/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/zsafe/.mtn2git_empty
diff --git a/packages/zsafe/zsafe_2.1.3.bb b/packages/zsafe/zsafe_2.1.3.bb
new file mode 100644
index 0000000000..f4b9d0c5ab
--- /dev/null
+++ b/packages/zsafe/zsafe_2.1.3.bb
@@ -0,0 +1,27 @@
+DESCRIPTION = "Password manager"
+SECTION     = "opie/applications"
+PRIORITY    = "optional"
+MAINTAINER  = "Carsten Schneider <zcarsten@gmx.net>"
+LICENSE     = "GPL"
+RCONFLICTS  = "opie-zsafe"
+APPNAME     = "zsafe"
+APPTYPE     = "binary"
+APPDESKTOP  = "${WORKDIR}"
+SRC_URI     = "http://z-soft.z-portal.info/zsafe/zsafe_2.1.3.tgz"
+S           = "${WORKDIR}"
+
+inherit opie
+
+QMAKE_PROFILES = "zsafe.pro"
+
+export OE_QMAKE_LINK="${CXX}"
+
+#FILES bin/zsafe apps/Applications/zsafe.desktop pics/zsafe/zsafe.png
+
+FILES_zsafe = "zsafe"
+
+do_install() {
+	install -d ${D}${palmtopdir}/pics/${APPNAME}/
+	install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.xpm ${D}${palmtopdir}/pics/${APPNAME}/
+	install -m 0644 ${WORKDIR}/zsafe.png ${D}${palmtopdir}/pics/
+}