r140 - trunk/oe/conf/distro/include

[mickey at gta01.hmw-consulting.de]

Author: mickey
Date: 2006-10-29 15:07:59 +0000 (Sun, 29 Oct 2006)
New Revision: 140

Modified:
   trunk/oe/conf/distro/include/openmoko.inc
   trunk/oe/conf/distro/include/preferred-openmoko-versions.inc
Log:
oe: add preferred versions for dbus and dbus-glib


Modified: trunk/oe/conf/distro/include/openmoko.inc
===================================================================
--- trunk/oe/conf/distro/include/openmoko.inc	2006-10-28 18:12:29 UTC (rev 139)
+++ trunk/oe/conf/distro/include/openmoko.inc	2006-10-29 15:07:59 UTC (rev 140)
@@ -65,15 +65,6 @@
 require conf/distro/include/preferred-xorg-versions-X11R7.1.inc
 
 #
-# Core System
-#
-PREFERRED_PROVIDER_dbus-glib = "dbus-glib"
-PREFERRED_PROVIDER_gconf = "gconf-dbus"
-PREFERRED_PROVIDER_gnome-vfs = "gnome-vfs-dbus"
-PREFERRED_PROVIDER_bluez-utils = "bluez-utils-dbus"
-PREFERRED_VERSION_qemu-native = "0.8.2"
-
-#
 # Opie
 #
 QTE_VERSION = "2.3.10"

Modified: trunk/oe/conf/distro/include/preferred-openmoko-versions.inc
===================================================================
--- trunk/oe/conf/distro/include/preferred-openmoko-versions.inc	2006-10-28 18:12:29 UTC (rev 139)
+++ trunk/oe/conf/distro/include/preferred-openmoko-versions.inc	2006-10-29 15:07:59 UTC (rev 140)
@@ -5,15 +5,16 @@
 #work around some breakages
 #SRCDATE_minimo=20050401
 
-#set some preferred providers:
 PREFERRED_PROVIDER_dbus-glib = "dbus-glib"
 PREFERRED_PROVIDER_gconf = "gconf-dbus"
 PREFERRED_PROVIDER_gnome-vfs = "gnome-vfs-dbus"
 PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
 PREFERRED_PROVIDER_bluez-utils = "bluez-utils-dbus"
 
-# Gtk+
+# dbus / Gtk+
 
+PREFERRED_VERSION_dbus = "0.92"
+PREFERRED_VERSION_dbus-glib = "0.71"
 PREFERRED_VERSION_atk = "1.9.0"
 PREFERRED_VERSION_pango = "1.8.2"
 PREFERRED_VERSION_glib-2.0 = "2.6.4"
@@ -22,6 +23,9 @@
 
 # Gnome
 
+# Development
+PREFERRED_VERSION_qemu-native = "0.8.2+cvs${SRCDATE}"
+
 # O-Hand
 PREFERRED_VERSION_dates = "0.1"
 PREFERRED_VERSION_contacts = "0.1"
@@ -33,4 +37,3 @@
 SRCDATE_openmoko-common = "now"
 SRCDATE_openmoko-theme-standard = "now"
 
-