[oe-commits] org.oe.dev openmoko: move preferred versions from openmoko.conf to

[john_lee commit]

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.

Author: john_lee at openmoko.com
Branch: org.openembedded.dev
Revision: feaf4dad269625b5df5eab552147633a4a913c9e
ViewMTN: http://monotone.openembedded.org/revision/info/feaf4dad269625b5df5eab552147633a4a913c9e
Files:
1
conf/distro/include/preferred-om-2008-versions.inc
conf/distro/openmoko.conf
Diffs:

#
# mt diff -r22486e1a7ecc33fc8a96db145ae5fbcb2cdf150d -rfeaf4dad269625b5df5eab552147633a4a913c9e
#
#
#
# patch "conf/distro/include/preferred-om-2008-versions.inc"
#  from [f09fc00fcb956472364428627b653deb21fa27ae]
#    to [a7b4d55a52fb71b8823f7113bf05ccd1928aacdc]
# 
# patch "conf/distro/openmoko.conf"
#  from [6d591fa65dcf807a8bb1e6a1f5e526db100b8778]
#    to [289ae1d49d8fded742aae514c40553218bfb1216]
#
============================================================
--- conf/distro/include/preferred-om-2008-versions.inc	f09fc00fcb956472364428627b653deb21fa27ae
+++ conf/distro/include/preferred-om-2008-versions.inc	a7b4d55a52fb71b8823f7113bf05ccd1928aacdc
@@ -1 +1,7 @@ PREFERRED_VERSION_vte = "0.16.10"
 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"
============================================================
--- conf/distro/openmoko.conf	6d591fa65dcf807a8bb1e6a1f5e526db100b8778
+++ conf/distro/openmoko.conf	289ae1d49d8fded742aae514c40553218bfb1216
@@ -61,12 +61,8 @@ PACKAGE_ARCH_pn-neod_fic-gta02 = "${MACH
 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"