From 6c44b5f5250f8c7912f5ca775a663a1cccc3c885 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sat, 9 Aug 2008 20:14:28 +0000 Subject: python 2.5.2 include low level _bsddb module in python-bsd and DEPENDS += db --- contrib/python/generate-manifest-2.5.py | 15 +++++++++------ packages/python/python-2.5-manifest.inc | 5 +++-- packages/python/python_2.5.2.bb | 6 +++--- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/contrib/python/generate-manifest-2.5.py b/contrib/python/generate-manifest-2.5.py index da5f7ccf8c..ee1b6753e3 100755 --- a/contrib/python/generate-manifest-2.5.py +++ b/contrib/python/generate-manifest-2.5.py @@ -22,16 +22,19 @@ class MakefileMaker: self.packages = {} self.targetPrefix = "${libdir}/python%s/" % VERSION[:3] self.output = outfile - self.out( "# WARNING: This file is AUTO GENERATED: Manual edits will be lost next time I regenerate the file." ) - self.out( "# Generator: '%s' Version %s (C) 2002-2008 Michael 'Mickey' Lauer " % ( sys.argv[0], __version__ ) ) - self.out( "# Visit the Python for Embedded Systems Site => http://www.Vanille.de/projects/python.spy" ) + self.out( """ \ +# WARNING: This file is AUTO GENERATED: Manual edits will be lost next time I regenerate the file. +# Generator: '%s' Version %s (C) 2002-2008 Michael 'Mickey' Lauer +# Visit the Python for Embedded Systems Site => http://www.Vanille.de/projects/python.spy +""" % ( sys.argv[0], __version__ ) ) + # # helper functions # def out( self, data ): """print a line to the output file""" - print >> self.output, data + self.output.write( "%s\n" % data ) def setPrefix( self, targetPrefix ): """set a file prefix for addPackage files""" @@ -167,8 +170,8 @@ if __name__ == "__main__": m.addPackage( 0, "python-audio", "Python Audio Handling", "python-core", "wave.* chunk.* sndhdr.* lib-dynload/ossaudiodev.so lib-dynload/audioop.so" ) - m.addPackage( 0, "python-bsddb", "Python Berkeley Database Bindings", "python-core", - "bsddb" ) # package + m.addPackage( 1, "python-bsddb", "Python Berkeley Database Bindings", "python-core", + "bsddb lib-dynload/_bsddb.so" ) # package m.addPackage( 0, "python-codecs", "Python Codecs, Encodings & i18n Support", "python-core python-lang", "codecs.* encodings gettext.* locale.* lib-dynload/_locale.so lib-dynload/unicodedata.so stringprep.* xdrlib.*" ) diff --git a/packages/python/python-2.5-manifest.inc b/packages/python/python-2.5-manifest.inc index a0ec692095..9ae307e7a4 100644 --- a/packages/python/python-2.5-manifest.inc +++ b/packages/python/python-2.5-manifest.inc @@ -1,6 +1,7 @@ # WARNING: This file is AUTO GENERATED: Manual edits will be lost next time I regenerate the file. # Generator: './generate-manifest-2.5.py' Version 20080722 (C) 2002-2008 Michael 'Mickey' Lauer # Visit the Python for Embedded Systems Site => http://www.Vanille.de/projects/python.spy + PROVIDES+="python-profile python-threading python-distutils python-doctest 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-devel python-difflib python-math python-syslog python-hotshot python-unixadmin python-textutils 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-sqlite3-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 " @@ -268,9 +269,9 @@ 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="ml0" +PR_python-bsddb="ml1" RDEPENDS_python-bsddb="python-core" -FILES_python-bsddb="${libdir}/python2.5/bsddb " +FILES_python-bsddb="${libdir}/python2.5/bsddb ${libdir}/python2.5/lib-dynload/_bsddb.so " DESCRIPTION_python-mmap="Python Memory-Mapped-File Support" PR_python-mmap="ml0" diff --git a/packages/python/python_2.5.2.bb b/packages/python/python_2.5.2.bb index 707c0f562e..c68f7d5e3b 100644 --- a/packages/python/python_2.5.2.bb +++ b/packages/python/python_2.5.2.bb @@ -3,10 +3,10 @@ HOMEPAGE = "http://www.python.org" LICENSE = "PSF" SECTION = "devel/python" PRIORITY = "optional" -DEPENDS = "python-native readline zlib gdbm openssl sqlite3 tcl tk" -DEPENDS_sharprom = "python-native readline zlib gdbm openssl" +DEPENDS = "python-native db gdbm openssl readline sqlite3 tcl tk zlib" +DEPENDS_sharprom = "python-native db readline zlib gdbm openssl" # bump this on every change in contrib/python/generate-manifest-2.5.py -PR = "ml8" +PR = "ml9" PYTHON_MAJMIN = "2.5" -- cgit v1.2.3