distutils-base.bbclass:

	* add support for python 2.5
	* catch more .debug files

diff --git a/classes/distutils-base.bbclass b/classes/distutils-base.bbclass
index db006b8..993ad79 100644 (file)
--- a/classes/distutils-base.bbclass
+++ b/classes/distutils-base.bbclass
@@ -7,9 +7,11 @@ def python_dir(d):
        staging_incdir = bb.data.getVar( "STAGING_INCDIR", d, 1 )
        if os.path.exists( "%s/python2.3" % staging_incdir ): return "python2.3"
        if os.path.exists( "%s/python2.4" % staging_incdir ): return "python2.4"
+       if os.path.exists( "%s/python2.5" % staging_incdir ): return "python2.5"
        raise "No Python in STAGING_INCDIR. Forgot to build python-native ?"
 
 PYTHON_DIR = "${@python_dir(d)}"
-FILES_${PN} = "${bindir}/* ${libdir}/* ${libdir}/${PYTHON_DIR}"
-FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/${SRCNAME}/.debug"
+FILES_${PN} = "${bindir}/* ${libdir}/* ${libdir}/${PYTHON_DIR}/*"
+FILES_${PN}-dbg = "${libdir}/${PYTHON_DIR}/site-packages/${SRCNAME}/.debug \
+                   ${libdir}/${PYTHON_DIR}/site-packages/.debug"