Remove uses of midpath 0.1 and replace with what is needed for 0.3.

preferred-om-2008-versions: Updated to midpath 0.3 rc1
openmoko: Added midpath preference.

diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc
index 66bb155..a9fbb30 100644 (file)
--- a/conf/distro/include/preferred-om-2008-versions.inc
+++ b/conf/distro/include/preferred-om-2008-versions.inc
@@ -1227,16 +1227,28 @@ PREFERRED_VERSION_microcom ?= "1.02"
 PREFERRED_VERSION_micro-emacs ?= "20060909"
 PREFERRED_VERSION_microwindows ?= "0.90"
 PREFERRED_VERSION_midori ?= "0.0.17"
-PREFERRED_VERSION_midpath ?= "0.1"
-PREFERRED_VERSION_midpath-alsa ?= "0.1"
-PREFERRED_VERSION_midpath-cldc ?= "0.1"
-PREFERRED_VERSION_midpath-cldc-native ?= "0.1"
-PREFERRED_VERSION_midpath-cldc-sdl ?= "0.1"
-PREFERRED_VERSION_midpath-cldc-x11 ?= "0.1"
-PREFERRED_VERSION_midpath-gtk ?= "0.1"
-PREFERRED_VERSION_midpath-qt3x11 ?= "0.1"
-PREFERRED_VERSION_midpath-qte ?= "0.1"
-PREFERRED_VERSION_midpath-test ?= "0.1"
+PREFERRED_VERSION_midpath-backend-alsa ?= "0.2+0.3rc1"
+PREFERRED_VERSION_midpath-backend-escher ?= "0.2+0.3rc1"
+PREFERRED_VERSION_midpath-backend-esd ?= "0.2+0.3rc1"
+PREFERRED_VERSION_midpath-backend-fb ?= "0.2+0.3rc1"  
+PREFERRED_VERSION_midpath-backend-gtk ?= "0.2+0.3rc1"
+PREFERRED_VERSION_midpath-backend-pulseaudio ?= "0.2+0.3rc1"
+PREFERRED_VERSION_midpath-backend-qt3x11 ?= "0.2+0.3rc1"  
+PREFERRED_VERSION_midpath-backend-qt4x11 ?= "0.2+0.3rc1"
+PREFERRED_VERSION_midpath-backend-qte ?= "0.2+0.3rc1"
+PREFERRED_VERSION_midpath-backend-sdl ?= "0.2+0.3rc1"
+PREFERRED_VERSION_midpath-cldc ?= "0.2+0.3rc1"
+PREFERRED_VERSION_midpath-core ?= "0.2+0.3rc1"
+PREFERRED_VERSION_midpath-demos ?= "0.2+0.3rc1"
+PREFERRED_VERSION_midpath-jgl ?= "0.2+0.3rc1"  
+PREFERRED_VERSION_midpath-location ?= "0.2+0.3rc1"
+PREFERRED_VERSION_midpath-m3g ?= "0.2+0.3rc1"
+PREFERRED_VERSION_midpath-maemo ?= "0.2+0.3rc1"
+PREFERRED_VERSION_midpath-messaging ?= "0.2+0.3rc1"
+PREFERRED_VERSION_midpath-opengles ?= "0.2+0.3rc1"
+PREFERRED_VERSION_midpath-openmoko ?= "0.2+0.3rc1" 
+PREFERRED_VERSION_midpath-svg ?= "0.2+0.3rc1"  
+PREFERRED_VERSION_midpath-webservices ?= "0.2+0.3rc1"
 PREFERRED_VERSION_mikmod ?= "3.2.2-beta1"
 PREFERRED_VERSION_mileage ?= "4.2.0-cvs-20060814"
 PREFERRED_VERSION_militaryalphabet ?= "0.2.1"

diff --git a/conf/distro/openmoko.conf b/conf/distro/openmoko.conf
index d7a3b98..75d9a97 100644 (file)
--- a/conf/distro/openmoko.conf
+++ b/conf/distro/openmoko.conf
@@ -62,6 +62,7 @@ PREFERRED_VERSION_gtk+-fastscaling = "2.10.14"
 PREFERRED_PROVIDER_classpath = "classpath"
 PREFERRED_PROVIDER_virtual/java-initial = "cacao-initial"
 PREFERRED_PROVIDER_swt3.4-gtk = "swt3.4-gtk"
+PREFERRED_PROVIDER_midpath = "midpath-openmoko"
 
 # deploy gta01 and gta02 in ${MACHINE_CLASS} directory
 DEPLOY_DIR_IMAGE_om-gta01 = "${DEPLOY_DIR}/images/${MACHINE_CLASS}"