4 files changed, 32 insertions, 10 deletions
diff --git a/packages/python/python-2.4.3/sitebranding.patch b/packages/python/python-2.4.3/sitebranding.patch
new file mode 100644
index 0000000000..85bb83a506
--- /dev/null
+++ b/packages/python/python-2.4.3/sitebranding.patch
@@ -0,0 +1,19 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- Python-2.4.3/Lib/site.py~sitebranding
++++ Python-2.4.3/Lib/site.py
+@@ -305,8 +305,9 @@
+             "Jython is maintained by the Jython developers (www.jython.org).")
+     else:
+         __builtin__.credits = _Printer("credits", """\
+-    Thanks to CWI, CNRI, BeOpen.com, Zope Corporation and a cast of thousands
+-    for supporting Python development.  See www.python.org for more information.""")
++    This version of Python has been built by the OpenEmbedded buildsystem (http://openembedded.org).
++    It is a part of the Python-For-Embedded-Systems initiative which is maintained by
++    Michael 'Mickey' Lauer (http://www.Vanille.de/projects/python.spy).""")
+     here = os.path.dirname(os.__file__)
+     __builtin__.license = _Printer(
+         "license", "See http://www.python.org/%.3s/license.html" % sys.version,
diff --git a/packages/python/python-pyqt4/optional-features.patch b/packages/python/python-pyqt4/optional-features.patch
index 02a4e80848..032824e39d 100644
--- a/packages/python/python-pyqt4/optional-features.patch
+++ b/packages/python/python-pyqt4/optional-features.patch
@@ -5,17 +5,16 @@
 
 --- PyQt4-gpl-4.0beta1/sip/QtGui/qsessionmanager.sip~optional-features.patch
 +++ PyQt4-gpl-4.0beta1/sip/QtGui/qsessionmanager.sip
-@@ -21,7 +21,8 @@
+@@ -21,7 +21,7 @@
  // PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
  // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  
 -
-+//%Feature SessionManager
 +%If (SessionManager)
  class QSessionManager : QObject
  {
  %TypeHeaderCode
-@@ -58,3 +59,4 @@
+@@ -58,3 +58,4 @@
      bool isPhase2() const;
      void requestPhase2();
  };
diff --git a/packages/python/python-pyqt4_0.9.bb b/packages/python/python-pyqt4_0.9.2.bb
index e56d6b36ef..099dc103ef 100644
--- a/packages/python/python-pyqt4_0.9.bb
+++ b/packages/python/python-pyqt4_0.9.2.bb
@@ -8,7 +8,7 @@ LICENSE = "GPL"
 DEPENDS = "qt4x11"
 RDEPENDS = "python-core"
 SRCNAME = "pyqt"
-PR = "ml0"
+PR = "ml2"
 
 SRC_URI = "http://www.riverbankcomputing.com/Downloads/PyQt4/GPL/PyQt4-gpl-4.0beta1.tar.gz \
            file://cross-compile.patch;patch=1 \
@@ -20,7 +20,7 @@ inherit qmake qt4x11 sip4 distutils-base
 PARALLEL_MAKE = ""
 
 QMAKE_PROFILES = "pyqt.pro"
-EXTRA_SIPTAGS = "-tWS_X11 -tQt_4_1_1 -xVendorID -xSessionManager -xAccessibility"
+EXTRA_SIPTAGS = "-tWS_X11 -tQt_4_1_2 -xVendorID -xSessionManager -xAccessibility"
 EXTRA_OEMAKE = " MAKEFLAGS= "
 
 SIP_MODULES = "QtCore QtGui QtNetwork QtSql QtSvg QtXml"
@@ -50,7 +50,7 @@ do_configure_prepend() {
 
 do_stage() {
     install -d ${STAGING_SIPDIR}/qt/
-    install -d ${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/
+    install -d ${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages
     for module in ${SIP_MODULES}
     do
         install -m 0644 ${S}/sip/${module}/*.sip ${STAGING_SIPDIR}/qt/
@@ -59,11 +59,14 @@ do_stage() {
 }
 
 do_install() {
-    install -d ${D}${libdir}/${PYTHON_DIR}/site-packages/
+    install -d ${D}${libdir}/${PYTHON_DIR}/site-packages/PyQt4
     for module in ${SIP_MODULES}
     do
-	install -m 0755 ${module}/lib${module}.so ${D}${libdir}/${PYTHON_DIR}/site-packages/${module}.so
+		echo "from PyQt4.${module} import *\n" >> ${D}${libdir}/${PYTHON_DIR}/site-packages/PyQt4/Qt.py
+		install -m 0755 ${module}/lib${module}.so ${D}${libdir}/${PYTHON_DIR}/site-packages/PyQt4/${module}.so
     done
+	cp -a elementtree ${D}${libdir}/${PYTHON_DIR}/site-packages/PyQt4/
+	cp __init__.py ${D}${libdir}/${PYTHON_DIR}/site-packages/PyQt4/
 }
 
 FILES_${PN} = "${libdir}/${PYTHON_DIR}/site-packages"
diff --git a/packages/python/python_2.4.3.bb b/packages/python/python_2.4.3.bb
index 289de18a53..30ce73abe2 100644
--- a/packages/python/python_2.4.3.bb
+++ b/packages/python/python_2.4.3.bb
@@ -6,14 +6,15 @@ PRIORITY = "optional"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 DEPENDS = "python-native readline zlib gdbm openssl tcl tk"
 DEPENDS_sharprom = "python-native readline zlib gdbm openssl"
-PR = "ml2"
+PR = "ml3"
 
 PYTHON_MAJMIN = "2.4"
 
 SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.bz2 \
            file://bindir-libdir.patch;patch=1 \
            file://crosscompile.patch;patch=1 \
-           file://fix-tkinter-detection.patch;patch=1"
+           file://fix-tkinter-detection.patch;patch=1 \
+           file://sitebranding.patch;patch=1"
 S = "${WORKDIR}/Python-${PV}"
 
 inherit autotools