merge of '486564afb93dc07dd531c82b2f7735424a813a69'

     and '894eccb0f6fd46f8c72a9457612feba217d953b6'

6 files changed, 28 insertions, 9 deletions

diff --git a/packages/python/python-2.5-manifest.inc b/packages/python/python-2.5-manifest.inc
index c098494d17..fda9f4143a 100644
--- a/packages/python/python-2.5-manifest.inc
+++ b/packages/python/python-2.5-manifest.inc
@@ -1,5 +1,5 @@
 ########################################################################################################################
-### AUTO-GENERATED by './generate-manifest-2.5.py' [(C) 2002-2008 Michael 'Mickey' Lauer <mlauer@vanille-media.de>] on Fri Mar 21 18:43:05 2008
+### AUTO-GENERATED by '../../contrib/python/generate-manifest-2.5.py' [(C) 2002-2008 Michael 'Mickey' Lauer <mlauer@vanille-media.de>] on Thu Apr 10 16:47:00 2008
 ###
 ### Visit THE Python for Embedded Systems Site => http://www.Vanille.de/projects/python.spy
 ###
@@ -208,8 +208,8 @@ RDEPENDS_python-mailbox="python-core python-mime"
 FILES_python-mailbox="${libdir}/python2.5/mailbox.* "
 
 DESCRIPTION_python-xml="Python basic XML support."
-PR_python-xml="ml0"
-RDEPENDS_python-xml="python-core python-re python-netclient"
+PR_python-xml="ml1"
+RDEPENDS_python-xml="python-core python-re"
 FILES_python-xml="${libdir}/python2.5/lib-dynload/pyexpat.so ${libdir}/python2.5/xml ${libdir}/python2.5/xmllib.* "
 
 DESCRIPTION_python-mime="Python MIME Handling APIs"
diff --git a/packages/python/python-dbus_0.82.4.bb b/packages/python/python-dbus_0.82.4.bb
index 08cdbf7f44..6940adf223 100644
--- a/packages/python/python-dbus_0.82.4.bb
+++ b/packages/python/python-dbus_0.82.4.bb
@@ -3,8 +3,8 @@ SECTION = "devel/python"
 HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
 LICENSE = "MIT"
 DEPENDS = "expat dbus dbus-glib virtual/libintl python-pyrex-native"
-RDEPENDS = "python-threading python-io python-stringold python-logging"
-PR = "ml3"
+RDEPENDS = "python-io python-logging python-stringold python-threading python-xml"
+PR = "ml4"
 
 SRC_URI = "http://dbus.freedesktop.org/releases/dbus-python/dbus-python-${PV}.tar.gz"
 S = "${WORKDIR}/dbus-python-${PV}"
diff --git a/packages/python/python-pydirectfb_cvs.bb b/packages/python/python-pydirectfb_cvs.bb
index cc0f3cfcd9..e730f0f8ba 100644
--- a/packages/python/python-pydirectfb_cvs.bb
+++ b/packages/python/python-pydirectfb_cvs.bb
@@ -2,6 +2,7 @@ DESCRIPTION = "DirectFB Bindings"
 SECTION = "devel/python"
 PRIORITY = "optional"
 LICENSE = "GPL"
+DEPENDS = "directfb"
 SRCNAME = "pydirectfb"
 PV = "0.0.0+cvs${SRCDATE}"
 PR = "ml0"
diff --git a/packages/python/python-pyrtc_svn.bb b/packages/python/python-pyrtc_svn.bb
new file mode 100644
index 0000000000..60277a029d
--- /dev/null
+++ b/packages/python/python-pyrtc_svn.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "PyRTC is a python extension module that supports talking to the \
+RTC (Real Time Clock) found in most PCs and SOCs"
+SECTION = "devel/python"
+HOMEPAGE = "http://www.freesmartphone.org"
+AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>"
+LICENSE = "GPLv2"
+SRCNAME = "pyrtc"
+DEPENDS = "python-cython-native"
+PV = "1.0.0+svnr${SRCREV}"
+PR = "ml0"
+
+SRC_URI = "svn://projects.linuxtogo.org/svn/smartphones/trunk/software;module=${SRCNAME}"
+S = "${WORKDIR}/${SRCNAME}"
+
+inherit distutils
+
diff --git a/packages/python/python-pyserial_2.2.bb b/packages/python/python-pyserial_2.2.bb
index a5d083c580..57d184fcc3 100644
--- a/packages/python/python-pyserial_2.2.bb
+++ b/packages/python/python-pyserial_2.2.bb
@@ -3,12 +3,13 @@ SECTION = "devel/python"
 PRIORITY = "optional"
 LICENSE = "PSF"
 SRCNAME = "pyserial"
-RDEPENDS = "python-fcntl python-io"
-
-PR = "r1"
+RDEPENDS = "python-fcntl python-io python-stringold"
+PR = "r2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/${SRCNAME}/${SRCNAME}-${PV}.zip"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit distutils
 
+# FIXME might stop packaging serialwin32 and serialjava files
+
diff --git a/packages/python/python_2.5.2.bb b/packages/python/python_2.5.2.bb
index af907f23c9..325e541b97 100644
--- a/packages/python/python_2.5.2.bb
+++ b/packages/python/python_2.5.2.bb
@@ -5,7 +5,8 @@ SECTION = "devel/python"
 PRIORITY = "optional"
 DEPENDS = "python-native readline zlib gdbm openssl sqlite3 tcl tk"
 DEPENDS_sharprom = "python-native readline zlib gdbm openssl"
-PR = "ml1"
+# bump this on every change in contrib/python/generate-manifest-2.5.py
+PR = "ml2"
 
 PYTHON_MAJMIN = "2.5"