diff options
| -rw-r--r-- | conf/distro/include/angstrom-2007-for-openmoko-versions.inc | 2 | ||||
| -rw-r--r-- | conf/distro/include/sane-srcrevs.inc | 3 | ||||
| -rw-r--r-- | packages/python/python-2.5-manifest.inc | 116 | ||||
| -rw-r--r-- | packages/python/python-2.5.2/.mtn2git_empty (renamed from packages/python/python-2.5.1/.mtn2git_empty) | 0 | ||||
| -rw-r--r-- | packages/python/python-2.5.2/autohell.patch (renamed from packages/python/python-2.5.1/autohell.patch) | 25 | ||||
| -rw-r--r-- | packages/python/python-2.5.2/bindir-libdir.patch (renamed from packages/python/python-2.5.1/bindir-libdir.patch) | 0 | ||||
| -rw-r--r-- | packages/python/python-2.5.2/crosscompile.patch (renamed from packages/python/python-2.5.1/crosscompile.patch) | 28 | ||||
| -rw-r--r-- | packages/python/python-2.5.2/default-is-optimized.patch (renamed from packages/python/python-2.5.1/default-is-optimized.patch) | 0 | ||||
| -rw-r--r-- | packages/python/python-2.5.2/enable-ctypes-module.patch (renamed from packages/python/python-2.5.1/enable-ctypes-module.patch) | 0 | ||||
| -rw-r--r-- | packages/python/python-2.5.2/fix-tkinter-detection.patch (renamed from packages/python/python-2.5.1/fix-tkinter-detection.patch) | 0 | ||||
| -rw-r--r-- | packages/python/python-2.5.2/sitebranding.patch (renamed from packages/python/python-2.5.1/sitebranding.patch) | 0 | ||||
| -rw-r--r-- | packages/python/python-2.5.2/sitecustomize.py (renamed from packages/python/python-2.5.1/sitecustomize.py) | 0 | ||||
| -rw-r--r-- | packages/python/python_2.5.2.bb (renamed from packages/python/python_2.5.1.bb) | 2 |
13 files changed, 89 insertions, 87 deletions
diff --git a/conf/distro/include/angstrom-2007-for-openmoko-versions.inc b/conf/distro/include/angstrom-2007-for-openmoko-versions.inc index 6cabe8164c..ef97eae09a 100644 --- a/conf/distro/include/angstrom-2007-for-openmoko-versions.inc +++ b/conf/distro/include/angstrom-2007-for-openmoko-versions.inc @@ -1489,7 +1489,7 @@ PREFERRED_VERSION_pwdutils ?= "2.6" PREFERRED_VERSION_pwlib ?= "1.5.2" PREFERRED_VERSION_pwmpi ?= "2.2.7" PREFERRED_VERSION_pxaregs ?= "1.14" -PREFERRED_VERSION_python ?= "2.5.1" +PREFERRED_VERSION_python ?= "2.5.2" PREFERRED_VERSION_python-ao ?= "0.82" PREFERRED_VERSION_python-constraint ?= "1.1" PREFERRED_VERSION_python-dbus ?= "0.81.1" diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 2ff0809324..ca6578509c 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -133,8 +133,9 @@ SRCREV_pn-opkg ?= "4022" SRCREV_pn-opkg-native ?= "4019" SRCREV_pn-oprofileui ?= "160" SRCREV_pn-psplash ?= "249" +SRCREV_pn-pyneod ?= "82" +SRCREV_pn-pyneog ?= "82" SRCREV_pn-python-formencode = "3148" -SRCREV_pn-python-fso-pyproto = "70" SRCREV_pn-python-gsmd = "127" SRCREV_pn-python-lightmediascanner = "68" SRCREV_pn-settings-daemon ?= "1755" diff --git a/packages/python/python-2.5-manifest.inc b/packages/python/python-2.5-manifest.inc index edf5c7697f..5288bafbf4 100644 --- a/packages/python/python-2.5-manifest.inc +++ b/packages/python/python-2.5-manifest.inc @@ -1,5 +1,5 @@ ######################################################################################################################## -### AUTO-GENERATED by 'contrib/python/generate-manifest-2.5.py' [(C) 2002-2008 Michael 'Mickey' Lauer <mlauer@vanille-media.de>] on Tue Jan 22 04:03:18 2008 +### AUTO-GENERATED by './generate-manifest-2.5.py' [(C) 2002-2008 Michael 'Mickey' Lauer <mlauer@vanille-media.de>] on Wed Feb 27 13:29:38 2008 ### ### Visit THE Python for Embedded Systems Site => http://www.Vanille.de/projects/python.spy ### @@ -13,287 +13,287 @@ PROVIDES+="python-profile python-threading python-distutils python-textutils pyt PACKAGES="python-profile python-threading python-distutils python-textutils 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-core-dbg python-resource python-devel python-math python-hotshot python-unixadmin python-syslog python-tkinter python-gdbm 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-tests python-unittest python-stringold python-robotparser python-lib-old-and-deprecated python-compile python-debugger python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio " DESCRIPTION_python-profile="Python Basic Profiling Support" -PR_python-profile="ml7" +PR_python-profile="ml0" RDEPENDS_python-profile="python-core" FILES_python-profile="${libdir}/python2.5/profile.* ${libdir}/python2.5/pstats.* " DESCRIPTION_python-threading="Python Threading & Synchronization Support" -PR_python-threading="ml7" +PR_python-threading="ml0" RDEPENDS_python-threading="python-core python-lang" FILES_python-threading="${libdir}/python2.5/_threading_local.* ${libdir}/python2.5/dummy_thread.* ${libdir}/python2.5/dummy_threading.* ${libdir}/python2.5/mutex.* ${libdir}/python2.5/threading.* ${libdir}/python2.5/Queue.* " DESCRIPTION_python-distutils="Python Distribution Utilities" -PR_python-distutils="ml7" +PR_python-distutils="ml0" RDEPENDS_python-distutils="python-core" FILES_python-distutils="${libdir}/python2.5/config ${libdir}/python2.5/distutils " DESCRIPTION_python-textutils="Python Option Parsing, Text Wrapping and Comma-Separated-Value Support" -PR_python-textutils="ml7" +PR_python-textutils="ml0" RDEPENDS_python-textutils="python-core python-io python-re python-stringold" FILES_python-textutils="${libdir}/python2.5/lib-dynload/_csv.so ${libdir}/python2.5/csv.* ${libdir}/python2.5/optparse.* ${libdir}/python2.5/textwrap.* " DESCRIPTION_python-codecs="Python Codecs, Encodings & i18n Support" -PR_python-codecs="ml7" +PR_python-codecs="ml0" RDEPENDS_python-codecs="python-core python-lang" FILES_python-codecs="${libdir}/python2.5/codecs.* ${libdir}/python2.5/encodings ${libdir}/python2.5/gettext.* ${libdir}/python2.5/locale.* ${libdir}/python2.5/lib-dynload/_locale.so ${libdir}/python2.5/lib-dynload/unicodedata.so ${libdir}/python2.5/stringprep.* ${libdir}/python2.5/xdrlib.* " DESCRIPTION_python-ctypes="Python C Types Support" -PR_python-ctypes="ml7" +PR_python-ctypes="ml0" RDEPENDS_python-ctypes="python-core" FILES_python-ctypes="${libdir}/python2.5/ctypes ${libdir}/python2.5/lib-dynload/_ctypes.so " DESCRIPTION_python-pickle="Python Persistence Support" -PR_python-pickle="ml7" +PR_python-pickle="ml0" RDEPENDS_python-pickle="python-core python-codecs python-io python-re" FILES_python-pickle="${libdir}/python2.5/pickle.* ${libdir}/python2.5/shelve.* ${libdir}/python2.5/lib-dynload/cPickle.so " DESCRIPTION_python-datetime="Python Calendar and Time support" -PR_python-datetime="ml7" +PR_python-datetime="ml0" RDEPENDS_python-datetime="python-core python-codecs" FILES_python-datetime="${libdir}/python2.5/_strptime.* ${libdir}/python2.5/calendar.* ${libdir}/python2.5/lib-dynload/datetime.so " DESCRIPTION_python-core="Python Interpreter and core modules (needed!)" -PR_python-core="ml7" +PR_python-core="ml0" RDEPENDS_python-core="" FILES_python-core="${libdir}/python2.5/__future__.* ${libdir}/python2.5/copy.* ${libdir}/python2.5/copy_reg.* ${libdir}/python2.5/ConfigParser.* ${libdir}/python2.5/getopt.* ${libdir}/python2.5/linecache.* ${libdir}/python2.5/new.* ${libdir}/python2.5/os.* ${libdir}/python2.5/posixpath.* ${libdir}/python2.5/struct.* ${libdir}/python2.5/warnings.* ${libdir}/python2.5/site.* ${libdir}/python2.5/stat.* ${libdir}/python2.5/UserDict.* ${libdir}/python2.5/UserList.* ${libdir}/python2.5/UserString.* ${libdir}/python2.5/lib-dynload/binascii.so ${libdir}/python2.5/lib-dynload/_struct.so ${libdir}/python2.5/lib-dynload/time.so ${libdir}/python2.5/lib-dynload/xreadlines.so ${libdir}/python2.5/types.* ${bindir}/python* " DESCRIPTION_python-io="Python Low-Level I/O" -PR_python-io="ml7" +PR_python-io="ml0" RDEPENDS_python-io="python-core python-math" FILES_python-io="${libdir}/python2.5/lib-dynload/_socket.so ${libdir}/python2.5/lib-dynload/_ssl.so ${libdir}/python2.5/lib-dynload/select.so ${libdir}/python2.5/lib-dynload/termios.so ${libdir}/python2.5/lib-dynload/cStringIO.so ${libdir}/python2.5/pipes.* ${libdir}/python2.5/socket.* ${libdir}/python2.5/tempfile.* ${libdir}/python2.5/StringIO.* " DESCRIPTION_python-compiler="Python Compiler Support" -PR_python-compiler="ml7" +PR_python-compiler="ml0" RDEPENDS_python-compiler="python-core" FILES_python-compiler="${libdir}/python2.5/compiler " DESCRIPTION_python-compression="Python High Level Compression Support" -PR_python-compression="ml7" +PR_python-compression="ml0" RDEPENDS_python-compression="python-core python-zlib" FILES_python-compression="${libdir}/python2.5/gzip.* ${libdir}/python2.5/zipfile.* " DESCRIPTION_python-re="Python Regular Expression APIs" -PR_python-re="ml7" +PR_python-re="ml0" RDEPENDS_python-re="python-core" FILES_python-re="${libdir}/python2.5/re.* ${libdir}/python2.5/sre.* ${libdir}/python2.5/sre_compile.* ${libdir}/python2.5/sre_constants* ${libdir}/python2.5/sre_parse.* " DESCRIPTION_python-xmlrpc="Python XMLRPC Support" -PR_python-xmlrpc="ml7" +PR_python-xmlrpc="ml0" RDEPENDS_python-xmlrpc="python-core python-xml python-netserver python-lang" FILES_python-xmlrpc="${libdir}/python2.5/xmlrpclib.* ${libdir}/python2.5/SimpleXMLRPCServer.* " DESCRIPTION_python-terminal="Python Terminal Controlling Support" -PR_python-terminal="ml7" +PR_python-terminal="ml0" RDEPENDS_python-terminal="python-core python-io" FILES_python-terminal="${libdir}/python2.5/pty.* ${libdir}/python2.5/tty.* " DESCRIPTION_python-email="Python Email Support" -PR_python-email="ml7" +PR_python-email="ml0" RDEPENDS_python-email="python-core python-io python-re python-mime python-audio python-image" FILES_python-email="${libdir}/python2.5/email " DESCRIPTION_python-image="Python Graphical Image Handling" -PR_python-image="ml7" +PR_python-image="ml0" RDEPENDS_python-image="python-core" FILES_python-image="${libdir}/python2.5/colorsys.* ${libdir}/python2.5/imghdr.* ${libdir}/python2.5/lib-dynload/imageop.so ${libdir}/python2.5/lib-dynload/rgbimg.so " DESCRIPTION_python-core-dbg="Python core module debug information" -PR_python-core-dbg="ml7" +PR_python-core-dbg="ml0" RDEPENDS_python-core-dbg="python-core" FILES_python-core-dbg="${libdir}/python2.5/lib-dynload/.debug ${bindir}/.debug ${libdir}/.debug " DESCRIPTION_python-resource="Python Resource Control Interface" -PR_python-resource="ml7" +PR_python-resource="ml0" RDEPENDS_python-resource="python-core" FILES_python-resource="${libdir}/python2.5/lib-dynload/resource.so " DESCRIPTION_python-devel="Python Development Package" -PR_python-devel="ml7" +PR_python-devel="ml0" RDEPENDS_python-devel="python-core" FILES_python-devel="${includedir} ${libdir}/python2.5/config " DESCRIPTION_python-math="Python Math Support" -PR_python-math="ml7" +PR_python-math="ml0" RDEPENDS_python-math="python-core" FILES_python-math="${libdir}/python2.5/lib-dynload/cmath.so ${libdir}/python2.5/lib-dynload/math.so ${libdir}/python2.5/lib-dynload/_random.so ${libdir}/python2.5/random.* ${libdir}/python2.5/sets.* " DESCRIPTION_python-hotshot="Python Hotshot Profiler" -PR_python-hotshot="ml7" +PR_python-hotshot="ml0" RDEPENDS_python-hotshot="python-core" FILES_python-hotshot="${libdir}/python2.5/hotshot ${libdir}/python2.5/lib-dynload/_hotshot.so " DESCRIPTION_python-unixadmin="Python Unix Administration Support" -PR_python-unixadmin="ml7" +PR_python-unixadmin="ml0" RDEPENDS_python-unixadmin="python-core" FILES_python-unixadmin="${libdir}/python2.5/lib-dynload/nis.so ${libdir}/python2.5/lib-dynload/grp.so ${libdir}/python2.5/lib-dynload/pwd.so ${libdir}/python2.5/getpass.* " DESCRIPTION_python-syslog="Python's syslog Interface" -PR_python-syslog="ml7" +PR_python-syslog="ml0" RDEPENDS_python-syslog="python-core" FILES_python-syslog="${libdir}/python2.5/lib-dynload/syslog.so " DESCRIPTION_python-tkinter="Python Tcl/Tk Bindings" -PR_python-tkinter="ml7" +PR_python-tkinter="ml0" RDEPENDS_python-tkinter="python-core" FILES_python-tkinter="${libdir}/python2.5/lib-dynload/_tkinter.so ${libdir}/python2.5/lib-tk " DESCRIPTION_python-gdbm="Python GNU Database Support" -PR_python-gdbm="ml7" +PR_python-gdbm="ml0" RDEPENDS_python-gdbm="python-core" FILES_python-gdbm="${libdir}/python2.5/lib-dynload/gdbm.so " DESCRIPTION_python-fcntl="Python's fcntl Interface" -PR_python-fcntl="ml7" +PR_python-fcntl="ml0" RDEPENDS_python-fcntl="python-core" FILES_python-fcntl="${libdir}/python2.5/lib-dynload/fcntl.so " DESCRIPTION_python-netclient="Python Internet Protocol Clients" -PR_python-netclient="ml7" +PR_python-netclient="ml0" RDEPENDS_python-netclient="python-core python-crypt python-datetime python-io python-lang python-logging python-mime" FILES_python-netclient="${libdir}/python2.5/*Cookie*.* ${libdir}/python2.5/base64.* ${libdir}/python2.5/cookielib.* ${libdir}/python2.5/ftplib.* ${libdir}/python2.5/gopherlib.* ${libdir}/python2.5/hmac.* ${libdir}/python2.5/httplib.* ${libdir}/python2.5/mimetypes.* ${libdir}/python2.5/nntplib.* ${libdir}/python2.5/poplib.* ${libdir}/python2.5/smtplib.* ${libdir}/python2.5/telnetlib.* ${libdir}/python2.5/urllib.* ${libdir}/python2.5/urllib2.* ${libdir}/python2.5/urlparse.* " DESCRIPTION_python-pprint="Python Pretty-Print Support" -PR_python-pprint="ml7" +PR_python-pprint="ml0" RDEPENDS_python-pprint="python-core" FILES_python-pprint="${libdir}/python2.5/pprint.* " DESCRIPTION_python-netserver="Python Internet Protocol Servers" -PR_python-netserver="ml7" +PR_python-netserver="ml0" RDEPENDS_python-netserver="python-core python-netclient" FILES_python-netserver="${libdir}/python2.5/cgi.* ${libdir}/python2.5/BaseHTTPServer.* ${libdir}/python2.5/SimpleHTTPServer.* ${libdir}/python2.5/SocketServer.* " DESCRIPTION_python-curses="Python Curses Support" -PR_python-curses="ml7" +PR_python-curses="ml0" RDEPENDS_python-curses="python-core" FILES_python-curses="${libdir}/python2.5/curses ${libdir}/python2.5/lib-dynload/_curses.so ${libdir}/python2.5/lib-dynload/_curses_panel.so " DESCRIPTION_python-smtpd="Python Simple Mail Transport Daemon" -PR_python-smtpd="ml7" +PR_python-smtpd="ml0" RDEPENDS_python-smtpd="python-core python-netserver python-email python-mime" FILES_python-smtpd="${bindir}/smtpd.* " DESCRIPTION_python-html="Python HTML Processing" -PR_python-html="ml7" +PR_python-html="ml0" RDEPENDS_python-html="python-core" FILES_python-html="${libdir}/python2.5/formatter.* ${libdir}/python2.5/htmlentitydefs.* ${libdir}/python2.5/htmllib.* ${libdir}/python2.5/markupbase.* ${libdir}/python2.5/sgmllib.* " DESCRIPTION_python-readline="Python Readline Support" -PR_python-readline="ml7" +PR_python-readline="ml0" RDEPENDS_python-readline="python-core" FILES_python-readline="${libdir}/python2.5/lib-dynload/readline.so ${libdir}/python2.5/rlcompleter.* " DESCRIPTION_python-subprocess="Python Subprocess Support" -PR_python-subprocess="ml7" +PR_python-subprocess="ml0" RDEPENDS_python-subprocess="python-core python-io python-re python-fcntl python-pickle" FILES_python-subprocess="${libdir}/python2.5/subprocess.* " DESCRIPTION_python-pydoc="Python Interactive Help Support" -PR_python-pydoc="ml7" +PR_python-pydoc="ml0" RDEPENDS_python-pydoc="python-core python-lang python-stringold python-re" FILES_python-pydoc="${bindir}/pydoc ${libdir}/python2.5/pydoc.* " DESCRIPTION_python-logging="Python Logging Support" -PR_python-logging="ml7" +PR_python-logging="ml0" RDEPENDS_python-logging="python-core python-io python-lang python-stringold" FILES_python-logging="${libdir}/python2.5/logging " DESCRIPTION_python-mailbox="Python Mailbox Format Support" -PR_python-mailbox="ml7" +PR_python-mailbox="ml0" RDEPENDS_python-mailbox="python-core python-mime" FILES_python-mailbox="${libdir}/python2.5/mailbox.* " DESCRIPTION_python-xml="Python basic XML support." -PR_python-xml="ml7" +PR_python-xml="ml0" RDEPENDS_python-xml="python-core python-re python-netclient" 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" -PR_python-mime="ml7" +PR_python-mime="ml0" RDEPENDS_python-mime="python-core python-io" FILES_python-mime="${libdir}/python2.5/mimetools.* ${libdir}/python2.5/uu.* ${libdir}/python2.5/quopri.* ${libdir}/python2.5/rfc822.* " DESCRIPTION_python-sqlite3="Python Sqlite3 Database Support" -PR_python-sqlite3="ml7" +PR_python-sqlite3="ml0" RDEPENDS_python-sqlite3="python-core" FILES_python-sqlite3="${libdir}/python2.5/sqlite3 " DESCRIPTION_python-tests="Python Tests" -PR_python-tests="ml7" +PR_python-tests="ml0" RDEPENDS_python-tests="python-core" FILES_python-tests="${libdir}/python2.5/test " DESCRIPTION_python-unittest="Python Unit Testing Framework" -PR_python-unittest="ml7" +PR_python-unittest="ml0" RDEPENDS_python-unittest="python-core python-stringold python-lang" FILES_python-unittest="${libdir}/python2.5/unittest.* " DESCRIPTION_python-stringold="Python String APIs [deprecated]" -PR_python-stringold="ml7" +PR_python-stringold="ml0" RDEPENDS_python-stringold="python-core python-re" FILES_python-stringold="${libdir}/python2.5/lib-dynload/strop.so ${libdir}/python2.5/string.* " DESCRIPTION_python-robotparser="Python robots.txt parser" -PR_python-robotparser="ml7" +PR_python-robotparser="ml0" RDEPENDS_python-robotparser="python-core python-netclient" FILES_python-robotparser="${libdir}/python2.5/robotparser.* " DESCRIPTION_python-lib-old-and-deprecated="Python Deprecated Libraries" -PR_python-lib-old-and-deprecated="ml7" +PR_python-lib-old-and-deprecated="ml0" RDEPENDS_python-lib-old-and-deprecated="python-core" FILES_python-lib-old-and-deprecated="${libdir}/python2.5/lib-old " DESCRIPTION_python-compile="Python Bytecode Compilation Support" -PR_python-compile="ml7" +PR_python-compile="ml0" RDEPENDS_python-compile="python-core" FILES_python-compile="${libdir}/python2.5/py_compile.* ${libdir}/python2.5/compileall.* " DESCRIPTION_python-debugger="Python Debugger" -PR_python-debugger="ml7" +PR_python-debugger="ml0" RDEPENDS_python-debugger="python-core python-io python-lang python-re python-stringold python-shell" FILES_python-debugger="${libdir}/python2.5/bdb.* ${libdir}/python2.5/pdb.* " DESCRIPTION_python-shell="Python Shell-Like Functionality" -PR_python-shell="ml7" +PR_python-shell="ml0" RDEPENDS_python-shell="python-core python-re" FILES_python-shell="${libdir}/python2.5/cmd.* ${libdir}/python2.5/commands.* ${libdir}/python2.5/dircache.* ${libdir}/python2.5/fnmatch.* ${libdir}/python2.5/glob.* ${libdir}/python2.5/popen2.* ${libdir}/python2.5/shutil.* " DESCRIPTION_python-bsddb="Python Berkeley Database Bindings" -PR_python-bsddb="ml7" +PR_python-bsddb="ml0" RDEPENDS_python-bsddb="python-core" FILES_python-bsddb="${libdir}/python2.5/bsddb " DESCRIPTION_python-mmap="Python Memory-Mapped-File Support" -PR_python-mmap="ml7" +PR_python-mmap="ml0" RDEPENDS_python-mmap="python-core python-io" FILES_python-mmap="${libdir}/python2.5/lib-dynload/mmap.so " DESCRIPTION_python-zlib="Python zlib Support." -PR_python-zlib="ml7" +PR_python-zlib="ml0" RDEPENDS_python-zlib="python-core" FILES_python-zlib="${libdir}/python2.5/lib-dynload/zlib.so " DESCRIPTION_python-db="Python File-Based Database Support" -PR_python-db="ml7" +PR_python-db="ml0" RDEPENDS_python-db="python-core" FILES_python-db="${libdir}/python2.5/anydbm.* ${libdir}/python2.5/dumbdbm.* ${libdir}/python2.5/whichdb.* " DESCRIPTION_python-crypt="Python Basic Cryptographic and Hashing Support" -PR_python-crypt="ml7" +PR_python-crypt="ml0" RDEPENDS_python-crypt="python-core" FILES_python-crypt="${libdir}/python2.5/hashlib.* ${libdir}/python2.5/md5.* ${libdir}/python2.5/sha.* ${libdir}/python2.5/lib-dynload/crypt.so ${libdir}/python2.5/lib-dynload/_hashlib.so ${libdir}/python2.5/lib-dynload/_sha256.so ${libdir}/python2.5/lib-dynload/_sha512.so " DESCRIPTION_python-idle="Python Integrated Development Environment" -PR_python-idle="ml7" +PR_python-idle="ml0" RDEPENDS_python-idle="python-core python-tkinter" FILES_python-idle="${bindir}/idle ${libdir}/python2.5/idlelib " DESCRIPTION_python-lang="Python Low-Level Language Support" -PR_python-lang="ml7" +PR_python-lang="ml0" RDEPENDS_python-lang="python-core" FILES_python-lang="${libdir}/python2.5/lib-dynload/array.so ${libdir}/python2.5/lib-dynload/parser.so ${libdir}/python2.5/lib-dynload/operator.so ${libdir}/python2.5/lib-dynload/_weakref.so ${libdir}/python2.5/lib-dynload/itertools.so ${libdir}/python2.5/lib-dynload/collections.so ${libdir}/python2.5/lib-dynload/_bisect.so ${libdir}/python2.5/lib-dynload/_heapq.so ${libdir}/python2.5/atexit.* ${libdir}/python2.5/bisect.* ${libdir}/python2.5/code.* ${libdir}/python2.5/codeop.* ${libdir}/python2.5/dis.* ${libdir}/python2.5/heapq.* ${libdir}/python2.5/inspect.* ${libdir}/python2.5/keyword.* ${libdir}/python2.5/opcode.* ${libdir}/python2.5/repr.* ${libdir}/python2.5/token.* ${libdir}/python2.5/tokenize.* ${libdir}/python2.5/traceback.* ${libdir}/python2.5/linecache.* ${libdir}/python2.5/weakref.* " DESCRIPTION_python-audio="Python Audio Handling" -PR_python-audio="ml7" +PR_python-audio="ml0" RDEPENDS_python-audio="python-core" FILES_python-audio="${libdir}/python2.5/wave.* ${libdir}/python2.5/chunk.* ${libdir}/python2.5/sndhdr.* ${libdir}/python2.5/lib-dynload/ossaudiodev.so ${libdir}/python2.5/lib-dynload/audioop.so " diff --git a/packages/python/python-2.5.1/.mtn2git_empty b/packages/python/python-2.5.2/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/python/python-2.5.1/.mtn2git_empty +++ b/packages/python/python-2.5.2/.mtn2git_empty diff --git a/packages/python/python-2.5.1/autohell.patch b/packages/python/python-2.5.2/autohell.patch index e2d63145be..32977955d4 100644 --- a/packages/python/python-2.5.1/autohell.patch +++ b/packages/python/python-2.5.2/autohell.patch @@ -1,22 +1,19 @@ -# -# FIXME: Don't simply rip this test out... add getting it from cache -# -Index: Python-2.5.1/configure.in +Index: Python-2.5.2/configure.in =================================================================== ---- Python-2.5.1.orig/configure.in -+++ Python-2.5.1/configure.in -@@ -3367,41 +3367,6 @@ else - AC_MSG_RESULT(no) - fi +--- Python-2.5.2.orig/configure.in ++++ Python-2.5.2/configure.in +@@ -3410,45 +3410,6 @@ esac + + -AC_MSG_CHECKING(for %zd printf() format support) -AC_TRY_RUN([#include <stdio.h> -#include <stddef.h> -#include <string.h> - --int main() --{ -- char buffer[256]; +-#ifdef HAVE_SYS_TYPES_H +-#include <sys/types.h> +-#endif - -#ifdef HAVE_SSIZE_T -typedef ssize_t Py_ssize_t; @@ -26,6 +23,10 @@ Index: Python-2.5.1/configure.in -typedef int Py_ssize_t; -#endif - +-int main() +-{ +- char buffer[256]; +- - if(sprintf(buffer, "%zd", (size_t)123) < 0) - return 1; - diff --git a/packages/python/python-2.5.1/bindir-libdir.patch b/packages/python/python-2.5.2/bindir-libdir.patch index 047c358a55..047c358a55 100644 --- a/packages/python/python-2.5.1/bindir-libdir.patch +++ b/packages/python/python-2.5.2/bindir-libdir.patch diff --git a/packages/python/python-2.5.1/crosscompile.patch b/packages/python/python-2.5.2/crosscompile.patch index f456048ef5..f1b1c6f3e0 100644 --- a/packages/python/python-2.5.1/crosscompile.patch +++ b/packages/python/python-2.5.2/crosscompile.patch @@ -1,11 +1,11 @@ # # Patch (C) by Michael 'Mickey' Lauer <mlauer@vanille-media.de> # -Index: Python-2.5.1/Makefile.pre.in +Index: Python-2.5.2/Makefile.pre.in =================================================================== ---- Python-2.5.1.orig/Makefile.pre.in -+++ Python-2.5.1/Makefile.pre.in -@@ -170,6 +170,7 @@ UNICODE_OBJS= @UNICODE_OBJS@ +--- Python-2.5.2.orig/Makefile.pre.in ++++ Python-2.5.2/Makefile.pre.in +@@ -173,6 +173,7 @@ UNICODE_OBJS= @UNICODE_OBJS@ PYTHON= python$(EXE) BUILDPYTHON= python$(BUILDEXE) @@ -13,7 +13,7 @@ Index: Python-2.5.1/Makefile.pre.in # === Definitions added by makesetup === -@@ -196,7 +197,7 @@ GRAMMAR_INPUT= $(srcdir)/Grammar/Grammar +@@ -199,7 +200,7 @@ GRAMMAR_INPUT= $(srcdir)/Grammar/Grammar ########################################################################## # Parser PGEN= Parser/pgen$(EXE) @@ -22,7 +22,7 @@ Index: Python-2.5.1/Makefile.pre.in POBJS= \ Parser/acceler.o \ Parser/grammar1.o \ -@@ -345,8 +346,8 @@ platform: $(BUILDPYTHON) +@@ -348,8 +349,8 @@ platform: $(BUILDPYTHON) # Build the shared modules sharedmods: $(BUILDPYTHON) case $$MAKEFLAGS in \ @@ -33,16 +33,16 @@ Index: Python-2.5.1/Makefile.pre.in esac # Build static library -@@ -470,7 +471,7 @@ Modules/python.o: $(srcdir)/Modules/pyth - +@@ -474,7 +475,7 @@ Modules/python.o: $(srcdir)/Modules/pyth $(GRAMMAR_H) $(GRAMMAR_C): $(PGEN) $(GRAMMAR_INPUT) + -@ mkdir Include - -$(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C) + -$(HOSTPGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C) $(PGEN): $(PGENOBJS) $(CC) $(OPT) $(LDFLAGS) $(PGENOBJS) $(LIBS) -o $(PGEN) -@@ -773,19 +774,19 @@ libinstall: $(BUILDPYTHON) $(srcdir)/Lib +@@ -782,19 +783,19 @@ libinstall: $(BUILDPYTHON) $(srcdir)/Lib done $(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ @@ -66,7 +66,7 @@ Index: Python-2.5.1/Makefile.pre.in -d $(LIBDEST)/site-packages -f \ -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages -@@ -885,7 +886,7 @@ libainstall: all +@@ -894,7 +895,7 @@ libainstall: all # Install the dynamically loadable modules # This goes into $(exec_prefix) sharedinstall: @@ -75,10 +75,10 @@ Index: Python-2.5.1/Makefile.pre.in --prefix=$(prefix) \ --install-scripts=$(BINDIR) \ --install-platlib=$(DESTSHARED) \ -Index: Python-2.5.1/setup.py +Index: Python-2.5.2/setup.py =================================================================== ---- Python-2.5.1.orig/setup.py -+++ Python-2.5.1/setup.py +--- Python-2.5.2.orig/setup.py ++++ Python-2.5.2/setup.py @@ -211,6 +211,7 @@ class PyBuildExt(build_ext): except ImportError, why: self.announce('*** WARNING: renaming "%s" since importing it' @@ -98,7 +98,7 @@ Index: Python-2.5.1/setup.py # Add paths specified in the environment variables LDFLAGS and # CPPFLAGS for header and library files. -@@ -341,6 +342,9 @@ class PyBuildExt(build_ext): +@@ -342,6 +343,9 @@ class PyBuildExt(build_ext): # XXX Omitted modules: gl, pure, dl, SGI-specific modules diff --git a/packages/python/python-2.5.1/default-is-optimized.patch b/packages/python/python-2.5.2/default-is-optimized.patch index 6beeb6e022..6beeb6e022 100644 --- a/packages/python/python-2.5.1/default-is-optimized.patch +++ b/packages/python/python-2.5.2/default-is-optimized.patch diff --git a/packages/python/python-2.5.1/enable-ctypes-module.patch b/packages/python/python-2.5.2/enable-ctypes-module.patch index dd5adaf0e7..dd5adaf0e7 100644 --- a/packages/python/python-2.5.1/enable-ctypes-module.patch +++ b/packages/python/python-2.5.2/enable-ctypes-module.patch diff --git a/packages/python/python-2.5.1/fix-tkinter-detection.patch b/packages/python/python-2.5.2/fix-tkinter-detection.patch index 93bd343381..93bd343381 100644 --- a/packages/python/python-2.5.1/fix-tkinter-detection.patch +++ b/packages/python/python-2.5.2/fix-tkinter-detection.patch diff --git a/packages/python/python-2.5.1/sitebranding.patch b/packages/python/python-2.5.2/sitebranding.patch index c6e486ae97..c6e486ae97 100644 --- a/packages/python/python-2.5.1/sitebranding.patch +++ b/packages/python/python-2.5.2/sitebranding.patch diff --git a/packages/python/python-2.5.1/sitecustomize.py b/packages/python/python-2.5.2/sitecustomize.py index 4c0ba3f0da..4c0ba3f0da 100644 --- a/packages/python/python-2.5.1/sitecustomize.py +++ b/packages/python/python-2.5.2/sitecustomize.py diff --git a/packages/python/python_2.5.1.bb b/packages/python/python_2.5.2.bb index ecfedf15fe..24b49f37ed 100644 --- a/packages/python/python_2.5.1.bb +++ b/packages/python/python_2.5.2.bb @@ -7,7 +7,7 @@ DEPENDS = "python-native readline zlib gdbm openssl sqlite3 tcl tk" DEPENDS_sharprom = "python-native readline zlib gdbm openssl" # NOTE: Keep the digit in sync with BASEREV in contrib/generate-manifest-2.5.py -PR = "ml10" +PR = "ml0" PYTHON_MAJMIN = "2.5" |