From: John Lee <john_lee@openmoko.org>
Date: Thu, 21 Feb 2008 07:42:35 +0000 (+0000)
Subject: openmoko: move preferred versions from openmoko.conf to
X-Git-Tag: Release-2010-05/1~7106^2^2~60
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2900fab04d7d26cbb3b1205fd6a4bb4e36f3a85e;p=openembedded.git

openmoko: move preferred versions from openmoko.conf to
          preferred-om-2008-versions.inc, where they should belong.
* also changed the preferred version of mono from 1.2.5.1 to 1.2.6.
---

diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc
index 2c2e0acb03..d7209be624 100644
--- a/conf/distro/include/preferred-om-2008-versions.inc
+++ b/conf/distro/include/preferred-om-2008-versions.inc
@@ -1 +1,7 @@
 PREFERRED_VERSION_vte = "0.16.10"
+PREFERRED_VERSION_dbus = "1.1.1"
+PREFERRED_VERSION_gpsdrive = "2.10pre4"
+PREFERRED_VERSION_asterisk = "1.4.17"
+PREFERRED_VERSION_gnash = "0.8.1"
+PREFERRED_VERSION_mono = "1.2.6"
+PREFERRED_VERSION_mono-mcs-intermediate = "1.2.6"
diff --git a/conf/distro/openmoko.conf b/conf/distro/openmoko.conf
index a14ad0c618..d7b3cf753a 100644
--- a/conf/distro/openmoko.conf
+++ b/conf/distro/openmoko.conf
@@ -61,12 +61,8 @@ PACKAGE_ARCH_pn-neod_fic-gta01 = "${MACHINE_CLASS}"
 PACKAGE_ARCH_pn-neod_fic-gta02 = "${MACHINE_CLASS}"
 
 # Select package versions we want to use.
-PREFERRED_VERSION_dbus = "1.1.1"
 PREFERRED_PROVIDER_gtk+ = "gtk+-fastscaling"
 PREFERRED_VERSION_gtk+-fastscaling = "2.10.14"
-PREFERRED_VERSION_gpsdrive = "2.10pre4"
-PREFERRED_VERSION_asterisk = "1.4.17"
-PREFERRED_VERSION_gnash = "0.8.1"
 
 # for jalimo
 PREFERRED_PROVIDER_classpath = "classpath"