diff options
| author | Graeme Gregory <dp@xora.org.uk> | 2006-10-04 10:24:43 +0000 |
|---|---|---|
| committer | Graeme Gregory <dp@xora.org.uk> | 2006-10-04 10:24:43 +0000 |
| commit | 668c42cb7e6ee3be1fb10dbc4c2e7f138734538b (patch) | |
| tree | c369dedfd70560abfee1174469f2885c21376d5c | |
| parent | 468b92a0c2dfae68923addccbe61dc4d2b64d305 (diff) | |
| parent | 2c66cf2e9d662ba8941dd11741f8e825a6f475c1 (diff) | |
merge of 'c0c96c93651e80c74259da321b816cfa0c76a7a1'
and 'e81ad8bbd55788f8132544a64394420053252ebf'
| -rwxr-xr-x | contrib/python/generate-manifest.py | 4 | ||||
| -rw-r--r-- | packages/gdbm/gdbm_1.8.3.bb | 3 | ||||
| -rw-r--r-- | packages/python/python-2.4.3-manifest.inc | 4 | ||||
| -rw-r--r-- | packages/python/python_2.4.3.bb | 4 |
4 files changed, 9 insertions, 6 deletions
diff --git a/contrib/python/generate-manifest.py b/contrib/python/generate-manifest.py index 2fd681dc01..0c0aea27c1 100755 --- a/contrib/python/generate-manifest.py +++ b/contrib/python/generate-manifest.py @@ -226,7 +226,7 @@ if __name__ == "__main__": m.addPackage( 0, "python-html", "Python HTML Processing", "python-core", "formatter.* htmlentitydefs.* htmllib.* markupbase.* sgmllib.* " ) - m.addPackage( 0, "python-gdbm", "Python GNU Database Support", "python-core, libgdbm3", + m.addPackage( 0, "python-gdbm", "Python GNU Database Support", "python-core", "lib-dynload/gdbm.so" ) m.addPackage( 0, "python-image", "Python Graphical Image Handling", "python-core", @@ -281,7 +281,7 @@ if __name__ == "__main__": m.addPackage( 0, "python-re", "Python Regular Expression APIs", "python-core", "re.* sre.* sre_compile.* sre_constants* sre_parse.*" ) # _sre is builtin - m.addPackage( 0, "python-readline", "Python Readline Support", "python-core, libreadline4", + m.addPackage( 0, "python-readline", "Python Readline Support", "python-core", "lib-dynload/readline.so rlcompleter.*" ) m.addPackage( 0, "python-resource", "Python Resource Control Interface", "python-core", diff --git a/packages/gdbm/gdbm_1.8.3.bb b/packages/gdbm/gdbm_1.8.3.bb index ecef5fc414..ad648f9f27 100644 --- a/packages/gdbm/gdbm_1.8.3.bb +++ b/packages/gdbm/gdbm_1.8.3.bb @@ -3,8 +3,11 @@ HOMEPAGE = "http://www.gnu.org/software/gdbm/gdbm.html" SECTION = "libs" PRIORITY = "optional" LICENSE = "GPL" + PR = "r2" +PACKAGES_DYNAMIC = "libgdbm*" + SRC_URI = "${GNU_MIRROR}/gdbm/gdbm-${PV}.tar.gz \ file://makefile.patch;patch=1 \ file://libtool-mode.patch;patch=1" diff --git a/packages/python/python-2.4.3-manifest.inc b/packages/python/python-2.4.3-manifest.inc index 1d14654f85..3a460e562a 100644 --- a/packages/python/python-2.4.3-manifest.inc +++ b/packages/python/python-2.4.3-manifest.inc @@ -124,7 +124,7 @@ FILES_python-tkinter="${libdir}/python2.4/lib-dynload/_tkinter.so ${libdir}/pyth DESCRIPTION_python-gdbm="Python GNU Database Support" PR_python-gdbm="ml0" -RDEPENDS_python-gdbm="python-core libgdbm3" +RDEPENDS_python-gdbm="python-core" FILES_python-gdbm="${libdir}/python2.4/lib-dynload/gdbm.so " DESCRIPTION_python-fcntl="Python's fcntl Interface" @@ -164,7 +164,7 @@ FILES_python-html="${libdir}/python2.4/formatter.* ${libdir}/python2.4/htmlentit DESCRIPTION_python-readline="Python Readline Support" PR_python-readline="ml0" -RDEPENDS_python-readline="python-core libreadline4" +RDEPENDS_python-readline="python-core" FILES_python-readline="${libdir}/python2.4/lib-dynload/readline.so ${libdir}/python2.4/rlcompleter.* " DESCRIPTION_python-subprocess="Python Subprocess Support" diff --git a/packages/python/python_2.4.3.bb b/packages/python/python_2.4.3.bb index 30c4ee1aee..2af6789b7a 100644 --- a/packages/python/python_2.4.3.bb +++ b/packages/python/python_2.4.3.bb @@ -6,7 +6,7 @@ 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 = "ml5" +PR = "ml6" PYTHON_MAJMIN = "2.4" @@ -68,5 +68,5 @@ require python-${PV}-manifest.inc RPROVIDES_python-core = "python" RPROVIDES_python-curses = "python" PACKAGES =+ "libpython2" -PACKAGES_DYNAMIC = "python-* libpython2" +PACKAGES_DYNAMIC = "libpython2" FILES_libpython2 = "${libdir}/libpython*" |