merge of '55c714e37be4606a4166b3df883d5f404d3889bf'

     and 'd714000fc8a6b75093a93f01782724b65d31eac1'

3 files changed, 7 insertions, 9 deletions

diff --git a/packages/python/python-2.5-manifest.inc b/packages/python/python-2.5-manifest.inc
index 6ba212df59..3d46d47bd0 100644
--- a/packages/python/python-2.5-manifest.inc
+++ b/packages/python/python-2.5-manifest.inc
@@ -143,8 +143,8 @@ 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="ml1"
-RDEPENDS_python-netclient="python-core python-datetime python-io python-lang python-logging python-mime"
+PR_python-netclient="ml2"
+RDEPENDS_python-netclient="python-core python-datetime python-io python-lang python-logging python-mime python-stringold"
 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"
@@ -198,8 +198,8 @@ RDEPENDS_python-mailbox="python-core python-mime"
 FILES_python-mailbox="${libdir}/python2.5/mailbox.* "
 
 DESCRIPTION_python-xml="Python basic XML support."
-PR_python-xml="ml1"
-RDEPENDS_python-xml="python-core python-re"
+PR_python-xml="ml2"
+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"
diff --git a/packages/python/python-native-2.5.1/cross-distutils.patch b/packages/python/python-native-2.5.1/cross-distutils.patch
index 76ae883c1d..3356c1abbe 100644
--- a/packages/python/python-native-2.5.1/cross-distutils.patch
+++ b/packages/python/python-native-2.5.1/cross-distutils.patch
@@ -16,22 +16,20 @@
  
  # python_build: (Boolean) if true, we're either building Python or
  # building an extension with an un-installed Python, so we use
-@@ -192,7 +192,8 @@
+@@ -192,7 +192,7 @@
      else:
          # The name of the config.h file changed in 2.2
          config_h = 'pyconfig.h'
 -    return os.path.join(inc_dir, config_h)
-+    print "NOTE: sysconfig.get_config_h_filename() altered for OpenEmbedded"
 +    return os.path.join(inc_dir, config_h).replace( os.getenv("BUILD_SYS"), os.getenv("HOST_SYS") )
  
  
  def get_makefile_filename():
-@@ -200,7 +201,8 @@
+@@ -200,7 +200,7 @@
      if python_build:
          return os.path.join(os.path.dirname(sys.executable), "Makefile")
      lib_dir = get_python_lib(plat_specific=1, standard_lib=1)
 -    return os.path.join(lib_dir, "config", "Makefile")
-+    print "NOTE: sysconfig.get_config_h_filename() altered for OpenEmbedded"
 +    return os.path.join(lib_dir, "config", "Makefile").replace( os.getenv("BUILD_SYS"), os.getenv("HOST_SYS") )
  
  
diff --git a/packages/python/python-native_2.5.1.bb b/packages/python/python-native_2.5.1.bb
index fdaefe549a..a64a4f96c8 100644
--- a/packages/python/python-native_2.5.1.bb
+++ b/packages/python/python-native_2.5.1.bb
@@ -4,7 +4,7 @@ LICENSE = "PSF"
 SECTION = "devel/python"
 PRIORITY = "optional"
 DEPENDS = ""
-PR = "ml0"
+PR = "ml1"
 
 EXCLUDE_FROM_WORLD = "1"