merge of '9a8a930122d29384549135ea3382884efdb4000e'

     and 'a0976fae9659c5e0c23233eaa6f5a6e777a1a044'

4 files changed, 36 insertions, 14 deletions

diff --git a/packages/python/python-gst/python-path.patch b/packages/python/python-gst/python-path.patch
index 465d5b180a..6cbad8cc5f 100644
--- a/packages/python/python-gst/python-path.patch
+++ b/packages/python/python-gst/python-path.patch
@@ -1,24 +1,33 @@
-Index: gst-python-0.10.7/acinclude.m4
+Index: gst-python-0.10.10/acinclude.m4
 ===================================================================
---- gst-python-0.10.7.orig/acinclude.m4	2007-03-02 14:10:28.652128590 +0100
-+++ gst-python-0.10.7/acinclude.m4	2007-03-02 14:41:00.106728708 +0100
-@@ -43,12 +43,19 @@
+--- gst-python-0.10.10.orig/acinclude.m4
++++ gst-python-0.10.10/acinclude.m4
+@@ -43,16 +43,20 @@ AC_DEFUN([AM_CHECK_PYTHON_HEADERS],
  [AC_REQUIRE([AM_PATH_PYTHON])
  AC_MSG_CHECKING(for headers required to compile python extensions)
  dnl deduce PYTHON_INCLUDES
+-py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
+-py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
+-if $PYTHON-config --help 2>/dev/null; then
+-  PYTHON_INCLUDES=`$PYTHON-config --includes 2>/dev/null`
 +
 +AC_ARG_WITH(python-includes,
-+	[  --with-python-includes=DIR  path to Python includes], py_exec_prefix=$withval)
++       [  --with-python-includes=DIR  path to Python includes], py_exec_prefix=$withval)
 +if test x$py_exec_prefix != x; then
-+PYTHON_INCLUDES="-I${py_exec_prefix}/include/python${PYTHON_VERSION}"
-+else
- py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
- py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
- PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
- if test "$py_prefix" != "$py_exec_prefix"; then
-   PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}"
++ PYTHON_INCLUDES="-I${py_exec_prefix}/include/python${PYTHON_VERSION}"
+ else
+-  PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
+-  if test "$py_prefix" != "$py_exec_prefix"; then
+-    PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}"
+-  fi
++ py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
++ py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
++ PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
++if test "$py_prefix" != "$py_exec_prefix"; then
++   PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}"
++ fi
  fi
-+fi
++
  AC_SUBST(PYTHON_INCLUDES)
  dnl check if the headers exist:
  save_CPPFLAGS="$CPPFLAGS"
diff --git a/packages/python/python-gst_0.10.8.bb b/packages/python/python-gst_0.10.10.bb
index 224d24b59a..cc1a19574e 100644
--- a/packages/python/python-gst_0.10.8.bb
+++ b/packages/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 = "ml1"
+PR = "ml0"
 
 SRC_URI = "http://gstreamer.freedesktop.org/src/gst-python/gst-python-${PV}.tar.bz2 \
            file://python-path.patch;patch=1"
diff --git a/packages/python/python-pyqt_4.3.3.bb b/packages/python/python-pyqt_4.3.3.bb
index 2fd6fcc38b..9dd2040a5b 100644
--- a/packages/python/python-pyqt_4.3.3.bb
+++ b/packages/python/python-pyqt_4.3.3.bb
@@ -4,6 +4,7 @@ AUTHOR = "Phil Thomson @ riverbank.co.uk"
 SECTION = "devel/python"
 PRIORITY = "optional"
 LICENSE = "GPL"
+DEPENDS = "sip-native python-sip"
 RDEPENDS = "python-core"
 SRCNAME = "pyqt"
 PR = "ml1"
diff --git a/packages/python/python-sqlalchemy_0.4.2p3.bb b/packages/python/python-sqlalchemy_0.4.2p3.bb
new file mode 100644
index 0000000000..2a797eb439
--- /dev/null
+++ b/packages/python/python-sqlalchemy_0.4.2p3.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "Python SQL toolkit and Object Relational Mapper that gives application developers the full power and flexibility of SQL"
+HOMEPAGE = "http://www.sqlalchemy.org/"
+SECTION = "devel/python"
+PRIORITY = "optional"
+LICENSE = "MIT"          
+SRCNAME = "SQLAlchemy"
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/sqlalchemy/${SRCNAME}-${PV}.tar.gz"
+S = "${WORKDIR}/${SRCNAME}-${PV}"
+
+inherit setuptools