Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev

9 files changed, 72 insertions, 15 deletions

diff --git a/recipes/python/python-2.6-manifest.inc b/recipes/python/python-2.6-manifest.inc
index 00eda6b9c9..cee12c866c 100644
--- a/recipes/python/python-2.6-manifest.inc
+++ b/recipes/python/python-2.6-manifest.inc
@@ -1,13 +1,13 @@
 
 # WARNING: This file is AUTO GENERATED: Manual edits will be lost next time I regenerate the file.
-# Generator: '../../contrib/python/generate-manifest-2.6.py' Version 20090812 (C) 2002-2009 Michael 'Mickey' Lauer <mlauer@vanille-media.de>
+# Generator: '../../contrib/python/generate-manifest-2.6.py' Version 20091004 (C) 2002-2009 Michael 'Mickey' Lauer <mlauer@vanille-media.de>
 # Visit the Python for Embedded Systems Site => http://www.Vanille.de/projects/python.spy
 
  
 
 PROVIDES+="python-profile python-threading python-distutils python-doctest python-stringold python-codecs python-ctypes python-pickle python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-tests python-core-dbg python-resource python-json python-devel python-difflib python-math python-syslog python-hotshot python-unixadmin python-textutils python-tkinter python-gdbm python-elementtree python-fcntl python-netclient python-pprint python-netserver python-curses python-smtpd python-html python-readline python-subprocess python-pydoc python-logging python-mailbox python-xml python-mime python-sqlite3 python-sqlite3-tests python-unittest python-multiprocessing python-robotparser python-compile python-debugger python-pkgutil python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio "
 
-PACKAGES="python-profile python-threading python-distutils python-doctest python-stringold python-codecs python-ctypes python-pickle python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-tests python-core-dbg python-resource python-json python-devel python-difflib python-math python-syslog python-hotshot python-unixadmin python-textutils python-tkinter python-gdbm python-elementtree python-fcntl python-netclient python-pprint python-netserver python-curses python-smtpd python-html python-readline python-subprocess python-pydoc python-logging python-mailbox python-xml python-mime python-sqlite3 python-sqlite3-tests python-unittest python-multiprocessing python-robotparser python-compile python-debugger python-pkgutil python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio  python-modules"
+PACKAGES="python-core-dbg python-profile python-threading python-distutils python-doctest python-stringold python-codecs python-ctypes python-pickle python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-tests python-resource python-json python-devel python-difflib python-math python-syslog python-hotshot python-unixadmin python-textutils python-tkinter python-gdbm python-elementtree python-fcntl python-netclient python-pprint python-netserver python-curses python-smtpd python-html python-readline python-subprocess python-pydoc python-logging python-mailbox python-xml python-mime python-sqlite3 python-sqlite3-tests python-unittest python-multiprocessing python-robotparser python-compile python-debugger python-pkgutil python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio python-modules"
 
 DESCRIPTION_python-profile="Python Basic Profiling Support"
 RDEPENDS_python-profile="python-core python-textutils"
@@ -87,7 +87,7 @@ FILES_python-tests="${libdir}/python2.6/test "
 
 DESCRIPTION_python-core-dbg="Python core module debug information"
 RDEPENDS_python-core-dbg="python-core"
-FILES_python-core-dbg="${libdir}/python2.6/lib-dynload/.debug ${bindir}/.debug ${libdir}/.debug "
+FILES_python-core-dbg="${libdir}/python2.6/config/.debug ${libdir}/python2.6/lib-dynload/.debug ${bindir}/.debug ${libdir}/.debug "
 
 DESCRIPTION_python-resource="Python Resource Control Interface"
 RDEPENDS_python-resource="python-core"
diff --git a/recipes/python/python-dbus_0.83.0.bb b/recipes/python/python-dbus_0.83.0.bb
index 7bc81f0396..02b73e64bf 100644
--- a/recipes/python/python-dbus_0.83.0.bb
+++ b/recipes/python/python-dbus_0.83.0.bb
@@ -3,20 +3,24 @@ SECTION = "devel/python"
 HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
 LICENSE = "MIT"
 DEPENDS = "expat dbus dbus-glib virtual/libintl python-pyrex-native"
-PR = "ml1"
+PR = "ml2"
 
 SRC_URI = "http://dbus.freedesktop.org/releases/dbus-python/dbus-python-${PV}.tar.gz"
 S = "${WORKDIR}/dbus-python-${PV}"
 
-inherit distutils-base autotools pkgconfig
+inherit distutils-base autotools_stage pkgconfig
 
 export BUILD_SYS
 export HOST_SYS
 
-do_stage() {
-	autotools_stage_all
-}
+RDEPENDS_${PN} = "\
+  python-io \
+  python-lang \
+  python-logging \
+  python-threading \
+  python-xml \
+"
 
-RDEPENDS = "python-io python-logging python-stringold python-threading python-xml"
-
-FILES_${PN}-dev += "${libdir}/pkgconfig 
+FILES_${PN}-dev += "\
+  ${libdir}/pkgconfig \
+"
diff --git a/recipes/python/python-django_1.0.2.bb b/recipes/python/python-django_1.0.2.bb
index 0c572eeeda..572e1906a9 100644
--- a/recipes/python/python-django_1.0.2.bb
+++ b/recipes/python/python-django_1.0.2.bb
@@ -16,11 +16,12 @@ DISTUTILS_INSTALL_ARGS = "--root=${D} --prefix=${prefix}"
 
 RDEPENDS_${PN} = "\
   python-email \
+  python-html \
   python-netserver \
   python-pickle \
   python-pprint \
   python-shell \
-  python-sqlite \
+  python-sqlite3 \
   python-textutils \
   python-threading \
   python-unixadmin \
diff --git a/recipes/python/python-etk_svn.bb b/recipes/python/python-etk_svn.bb
index aff6b1f982..85cb824b2d 100644
--- a/recipes/python/python-etk_svn.bb
+++ b/recipes/python/python-etk_svn.bb
@@ -4,6 +4,8 @@ RDEPENDS += "python-evas python-ecore python-edje python-numeric python-math etk
 PV = "0.1.1+svnr${SRCREV}"
 PR = "ml1"
 
+SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk/OLD/BINDINGS/python;module=${PN};proto=http"
+
 do_stage() {         
 	distutils_stage_all 
 }  
diff --git a/recipes/python/python-flup_1.0.1.bb b/recipes/python/python-flup_1.0.2.bb
index d5f865da11..d5f865da11 100644
--- a/recipes/python/python-flup_1.0.1.bb
+++ b/recipes/python/python-flup_1.0.2.bb
diff --git a/recipes/python/python-gst_0.10.10.bb b/recipes/python/python-gst_0.10.10.bb
index faef7cb5f1..0de87d6f42 100644
--- a/recipes/python/python-gst_0.10.10.bb
+++ b/recipes/python/python-gst_0.10.10.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Python Gstreamer bindings"
 SECTION = "devel/python"
 LICENSE = "LGPL"
 DEPENDS = "gstreamer gst-plugins-base python-pygobject"
-PR = "ml3"
+PR = "ml4"
 
 SRC_URI = "\
   http://gstreamer.freedesktop.org/src/gst-python/gst-python-${PV}.tar.bz2 \
@@ -11,7 +11,9 @@ SRC_URI = "\
 "
 S = "${WORKDIR}/gst-python-${PV}"
 
-inherit autotools distutils-base pkgconfig
+inherit autotools pkgconfig  distutils-base
+
+require fix-path.inc
 
 EXTRA_OECONF += "--with-python-includes=${STAGING_INCDIR}/../"
 
diff --git a/recipes/python/python-gst_0.10.17.bb b/recipes/python/python-gst_0.10.17.bb
new file mode 100644
index 0000000000..5695e6e04e
--- /dev/null
+++ b/recipes/python/python-gst_0.10.17.bb
@@ -0,0 +1,36 @@
+DESCRIPTION = "Python Gstreamer bindings"
+SECTION = "devel/python"
+LICENSE = "LGPL"
+DEPENDS = "gstreamer gst-plugins-base python-pygobject"
+
+SRC_URI = "\
+  http://gstreamer.freedesktop.org/src/gst-python/gst-python-${PV}.tar.bz2 \
+  file://python-path.patch;patch=1 \
+  file://import-gobject-instead-of-pygtk.patch;patch=1 \
+"
+S = "${WORKDIR}/gst-python-${PV}"
+
+inherit autotools pkgconfig  distutils-base
+
+require fix-path.inc
+
+EXTRA_OECONF += "--with-python-includes=${STAGING_INCDIR}/../"
+
+do_configure_prepend() {
+    install -d ${S}/m4
+    install -m 0644 ${S}/common/m4/*.m4 ${S}/m4/
+}
+
+do_stage() {
+	autotools_stage_all
+}
+
+PACKAGES =+ "${PN}-examples"
+
+FILES_${PN} += "${datadir}/gst-python"
+FILES_${PN}-dev += "\
+  ${datadir}/gst-python/0.10/defs \
+  ${libdir}/${PYTHON_DIR}/site-packages/gst-0.10/gst/*.la \
+"
+FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/gst-0.10/gst/.debug/ ${libdir}/gstreamer-0.10/.debug/"
+FILES_${PN}-examples = "${datadir}/gst-python/0.10/examples"
diff --git a/recipes/python/python-wpactrl_svn.bb b/recipes/python/python-wpactrl_svn.bb
new file mode 100644
index 0000000000..e0e8a05195
--- /dev/null
+++ b/recipes/python/python-wpactrl_svn.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "A Python extension for wpa_supplicant/hostapd control interface access"
+SECTION = "devel/python"
+LICENSE = "GPLv2"
+HOMEPAGE = "http://projects.otaku42.de/wiki/PythonWpaCtrl"
+
+inherit distutils
+
+SRCREV = "383"
+SRC_URI = "svn://svn.otaku42.de;module=python-wpactrl;proto=http"
+S = "${WORKDIR}/python-wpactrl/trunk"
+PV = "1.0.1+svnr${SRCREV}"
+
diff --git a/recipes/python/python.inc b/recipes/python/python.inc
index 5791297609..7e61f795ba 100644
--- a/recipes/python/python.inc
+++ b/recipes/python/python.inc
@@ -4,7 +4,7 @@ LICENSE = "PSF"
 SECTION = "devel/python"
 PRIORITY = "optional"
 # bump this on every change in contrib/python/generate-manifest-2.6.py
-INC_PR = "ml7"
+INC_PR = "ml8"
 
 DEFAULT_PREFERENCE = "-26"