rendered paste bodydiff --git a/contrib/python/generate-manifest-2.6.py b/contrib/python/generate-manifest-2.6.pyindex d6fdcb4..de197f1 100755--- a/contrib/python/generate-manifest-2.6.py+++ b/contrib/python/generate-manifest-2.6.py@@ -122,7 +122,7 @@ class MakefileMaker: line = 'RDEPENDS_python-modules="' for name, data in self.packages.iteritems():- if name != 'python-core-dbg':+ if name != 'python-core-dbg' and name != 'python-dev': line += "%s " % name self.out( "%s \"" % line )@@ -163,8 +163,8 @@ if __name__ == "__main__": m.addPackage( "python-core-dbg", "Python core module debug information", "python-core", "lib-dynload/.debug ${bindir}/.debug ${libdir}/.debug" ) - m.addPackage( "python-devel", "Python Development Package", "python-core",- "${includedir} config" ) # package+ m.addPackage( "python-dev", "Python Development Package", "python-core",+ "${libdir}/libpython*.so ${includedir} config" ) # package m.addPackage( "python-idle", "Python Integrated Development Environment", "python-core python-tkinter", "${bindir}/idle idlelib" ) # packagediff --git a/recipes/python/python-2.6-manifest.inc b/recipes/python/python-2.6-manifest.incindex aff86a1..89346f0 100644--- a/recipes/python/python-2.6-manifest.inc+++ b/recipes/python/python-2.6-manifest.inc@@ -1,17 +1,17 @@ # WARNING: This file is AUTO GENERATED: Manual edits will be lost next time I regenerate the file.-# Generator: '/local/pkg/oe/openembedded/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 20090812 (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 "+PROVIDES+="python-codecs python-threading python-distutils python-doctest python-stringold python-curses python-ctypes python-pickle python-datetime python-core python-io python-compression python-re python-profile python-xmlrpc python-terminal python-dev python-email python-image python-tests python-core-dbg python-resource python-json 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-compiler 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-codecs python-threading python-distutils python-doctest python-stringold python-curses python-ctypes python-pickle python-datetime python-core python-io python-compression python-re python-profile python-xmlrpc python-terminal python-dev python-email python-image python-tests python-core-dbg python-resource python-json 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-compiler 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"-FILES_python-profile="${libdir}/python2.6/profile.* ${libdir}/python2.6/pstats.* ${libdir}/python2.6/cProfile.* ${libdir}/python2.6/lib-dynload/_lsprof.so "+DESCRIPTION_python-codecs="Python Codecs, Encodings & i18n Support"+RDEPENDS_python-codecs="python-core python-lang"+FILES_python-codecs="${libdir}/python2.6/codecs.* ${libdir}/python2.6/encodings ${libdir}/python2.6/gettext.* ${libdir}/python2.6/locale.* ${libdir}/python2.6/lib-dynload/_locale.so ${libdir}/python2.6/lib-dynload/unicodedata.so ${libdir}/python2.6/stringprep.* ${libdir}/python2.6/xdrlib.* " DESCRIPTION_python-threading="Python Threading & Synchronization Support" RDEPENDS_python-threading="python-core python-lang"@@ -29,9 +29,9 @@ DESCRIPTION_python-stringold="Python String APIs [deprecated]" RDEPENDS_python-stringold="python-core python-re" FILES_python-stringold="${libdir}/python2.6/lib-dynload/strop.so ${libdir}/python2.6/string.* " -DESCRIPTION_python-codecs="Python Codecs, Encodings & i18n Support"-RDEPENDS_python-codecs="python-core python-lang"-FILES_python-codecs="${libdir}/python2.6/codecs.* ${libdir}/python2.6/encodings ${libdir}/python2.6/gettext.* ${libdir}/python2.6/locale.* ${libdir}/python2.6/lib-dynload/_locale.so ${libdir}/python2.6/lib-dynload/unicodedata.so ${libdir}/python2.6/stringprep.* ${libdir}/python2.6/xdrlib.* "+DESCRIPTION_python-curses="Python Curses Support"+RDEPENDS_python-curses="python-core"+FILES_python-curses="${libdir}/python2.6/curses ${libdir}/python2.6/lib-dynload/_curses.so ${libdir}/python2.6/lib-dynload/_curses_panel.so " DESCRIPTION_python-ctypes="Python C Types Support" RDEPENDS_python-ctypes="python-core"@@ -53,10 +53,6 @@ DESCRIPTION_python-io="Python Low-Level I/O" RDEPENDS_python-io="python-core python-math" FILES_python-io="${libdir}/python2.6/lib-dynload/_socket.so ${libdir}/python2.6/lib-dynload/_ssl.so ${libdir}/python2.6/lib-dynload/select.so ${libdir}/python2.6/lib-dynload/termios.so ${libdir}/python2.6/lib-dynload/cStringIO.so ${libdir}/python2.6/pipes.* ${libdir}/python2.6/socket.* ${libdir}/python2.6/tempfile.* ${libdir}/python2.6/StringIO.* " -DESCRIPTION_python-compiler="Python Compiler Support"-RDEPENDS_python-compiler="python-core"-FILES_python-compiler="${libdir}/python2.6/compiler "- DESCRIPTION_python-compression="Python High Level Compression Support" RDEPENDS_python-compression="python-core python-zlib" FILES_python-compression="${libdir}/python2.6/gzip.* ${libdir}/python2.6/zipfile.* ${libdir}/python2.6/tarfile.* ${libdir}/python2.6/lib-dynload/bz2.so "@@ -65,6 +61,10 @@ DESCRIPTION_python-re="Python Regular Expression APIs" RDEPENDS_python-re="python-core" FILES_python-re="${libdir}/python2.6/re.* ${libdir}/python2.6/sre.* ${libdir}/python2.6/sre_compile.* ${libdir}/python2.6/sre_constants* ${libdir}/python2.6/sre_parse.* " +DESCRIPTION_python-profile="Python Basic Profiling Support"+RDEPENDS_python-profile="python-core python-textutils"+FILES_python-profile="${libdir}/python2.6/profile.* ${libdir}/python2.6/pstats.* ${libdir}/python2.6/cProfile.* ${libdir}/python2.6/lib-dynload/_lsprof.so "+ DESCRIPTION_python-xmlrpc="Python XMLRPC Support" RDEPENDS_python-xmlrpc="python-core python-xml python-netserver python-lang" FILES_python-xmlrpc="${libdir}/python2.6/xmlrpclib.* ${libdir}/python2.6/SimpleXMLRPCServer.* "@@ -73,6 +73,10 @@ DESCRIPTION_python-terminal="Python Terminal Controlling Support" RDEPENDS_python-terminal="python-core python-io" FILES_python-terminal="${libdir}/python2.6/pty.* ${libdir}/python2.6/tty.* " +DESCRIPTION_python-dev="Python Development Package"+RDEPENDS_python-dev="python-core"+FILES_python-dev="${libdir}/libpython*.so ${includedir} ${libdir}/python2.6/config "+ DESCRIPTION_python-email="Python Email Support" RDEPENDS_python-email="python-core python-io python-re python-mime python-audio python-image python-netclient" FILES_python-email="${libdir}/python2.6/imaplib.* ${libdir}/python2.6/email "@@ -97,10 +101,6 @@ DESCRIPTION_python-json="Python JSON Support" RDEPENDS_python-json="python-core python-math python-re" FILES_python-json="${libdir}/python2.6/json " -DESCRIPTION_python-devel="Python Development Package"-RDEPENDS_python-devel="python-core"-FILES_python-devel="${includedir} ${libdir}/python2.6/config "- DESCRIPTION_python-difflib="Python helpers for computing deltas between objects." RDEPENDS_python-difflib="python-lang python-re" FILES_python-difflib="${libdir}/python2.6/difflib.* "@@ -153,9 +153,9 @@ DESCRIPTION_python-netserver="Python Internet Protocol Servers" RDEPENDS_python-netserver="python-core python-netclient" FILES_python-netserver="${libdir}/python2.6/cgi.* ${libdir}/python2.6/BaseHTTPServer.* ${libdir}/python2.6/SimpleHTTPServer.* ${libdir}/python2.6/SocketServer.* " -DESCRIPTION_python-curses="Python Curses Support"-RDEPENDS_python-curses="python-core"-FILES_python-curses="${libdir}/python2.6/curses ${libdir}/python2.6/lib-dynload/_curses.so ${libdir}/python2.6/lib-dynload/_curses_panel.so "+DESCRIPTION_python-compiler="Python Compiler Support"+RDEPENDS_python-compiler="python-core"+FILES_python-compiler="${libdir}/python2.6/compiler " DESCRIPTION_python-smtpd="Python Simple Mail Transport Daemon" RDEPENDS_python-smtpd="python-core python-netserver python-email python-mime"@@ -262,7 +262,7 @@ RDEPENDS_python-audio="python-core" FILES_python-audio="${libdir}/python2.6/wave.* ${libdir}/python2.6/chunk.* ${libdir}/python2.6/sndhdr.* ${libdir}/python2.6/lib-dynload/ossaudiodev.so ${libdir}/python2.6/lib-dynload/audioop.so " DESCRIPTION_python-modules="All Python modules"-RDEPENDS_python-modules="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 "+RDEPENDS_python-modules="python-codecs python-threading python-distutils python-doctest python-stringold python-curses python-ctypes python-pickle python-datetime python-core python-io python-compression python-re python-profile python-xmlrpc python-terminal python-email python-image python-tests python-resource python-json 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-compiler 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 " ALLOW_EMPTY_python-modules = "1" diff --git a/recipes/python/python.inc b/recipes/python/python.incindex b31d80e..5791297 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 = "ml6"+INC_PR = "ml7" DEFAULT_PREFERENCE = "-26" diff --git a/recipes/python/python_2.6.2.bb b/recipes/python/python_2.6.2.bbindex 941f039..6e40a89 100644--- a/recipes/python/python_2.6.2.bb+++ b/recipes/python/python_2.6.2.bb@@ -102,7 +102,7 @@ FILES_python-core += "${bindir}/2to3" # package libpython2 PACKAGES =+ "libpython2"-FILES_libpython2 = "${libdir}/libpython*.so*"+FILES_libpython2 = "${libdir}/libpython*.so.*" # additional stuff -dev @@ -127,5 +127,4 @@ PACKAGES += "python-misc" FILES_python-misc = "${libdir}/python${PYTHON_MAJMIN}" # catch manpage-PACKAGES += "python-man"-FILES_python-man = "${datadir}/man"+PACKAGES += "python-doc"