[Esbox-commits] r1869 - trunk/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/project/core

[eswartz at garage.maemo.org]

Author: eswartz
Date: 2009-07-11 00:02:15 +0300 (Sat, 11 Jul 2009)
New Revision: 1869

Modified:
   trunk/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/project/core/ESboxPythonProjectPackageGatherer.java
Log:
Merge rev 1868 from work_Ed branch

Modified: trunk/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/project/core/ESboxPythonProjectPackageGatherer.java
===================================================================
--- trunk/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/project/core/ESboxPythonProjectPackageGatherer.java	2009-07-10 20:56:52 UTC (rev 1868)
+++ trunk/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/project/core/ESboxPythonProjectPackageGatherer.java	2009-07-10 21:02:15 UTC (rev 1869)
@@ -20,6 +20,7 @@
 import org.maemo.mica.common.project.core.NatureUtils;
 import org.maemo.mica.internal.api.linux.packages.core.IProjectPackageGatherer;
 import org.maemo.mica.internal.api.linux.packages.core.ProjectPackageInfo;
+import org.maemo.mica.internal.api.maemosdk.core.MaemoSDKPlatform;
 
 /**
  * Provide the maemo-specific Python development packages for a project.
@@ -47,8 +48,12 @@
 					info.getSystemPackages().add("maemo-python-env");
 				else
 					info.getSystemPackages().add("maemo-python-device-env");
-				
-				info.getSystemPackages().add("python2.5-distutils");
+
+				// this package is merged into other packages in Fremantle
+				if (sdkTarget.getPlatform().getVersion().compareTo(
+						MaemoSDKPlatform.FREMANTLE.getVersion()) < 0) {
+					info.getSystemPackages().add("python2.5-distutils");
+				}
 			}
 			return info;
 		}