diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2006-05-03 14:29:36 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-05-03 14:29:36 +0000 |
| commit | 914ca8cc9334fde6c2eb0c6e356840f5cc3944f0 (patch) | |
| tree | dd1f2be0b0270e4710b2a01928e55660b8e350d3 | |
| parent | ab60b907a46f9d0e55551ae52ad408bb5b278bbf (diff) | |
| parent | 11616e3588c8df8985418a759612fadb30cc0c3c (diff) | |
merge of 853e35738795ae7caa7858e2df6f8cf805e42cc2
and ddc2ba34a8ed2f37044bdcbbe0d0716407db6565
| -rw-r--r-- | packages/python/python-2.4.3/sitebranding.patch | 19 | ||||
| -rw-r--r-- | packages/python/python-pyqt4_0.9.2.bb (renamed from packages/python/python-pyqt4_0.9.bb) | 4 | ||||
| -rw-r--r-- | packages/python/python_2.4.3.bb | 5 |
3 files changed, 24 insertions, 4 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_0.9.bb b/packages/python/python-pyqt4_0.9.2.bb index 4a52e46f18..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 = "ml1" +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" 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 |