summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross@openedhand.com>2007-01-10 11:30:47 +0000
committerRoss Burton <ross@openedhand.com>2007-01-10 11:30:47 +0000
commit81c9ad8b0f826c1aab3ebe1eff6ccb88141bf0ad (patch)
tree4b127770678f646bd5b5c588fb42ecd9d2a984e7 /meta
parentc7e1d674858ddadd6f34bb07715654f376025f59 (diff)
downloadpoky-81c9ad8b0f826c1aab3ebe1eff6ccb88141bf0ad.tar.gz
poky-81c9ad8b0f826c1aab3ebe1eff6ccb88141bf0ad.tar.bz2
poky-81c9ad8b0f826c1aab3ebe1eff6ccb88141bf0ad.zip
Upgrade to DBus 1.0 in poky
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1139 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
-rw-r--r--meta/conf/distro/poky-bleeding.conf13
-rw-r--r--meta/conf/distro/poky.conf16
2 files changed, 8 insertions, 21 deletions
diff --git a/meta/conf/distro/poky-bleeding.conf b/meta/conf/distro/poky-bleeding.conf
index 7637a0d2fd..3d7ae29ddb 100644
--- a/meta/conf/distro/poky-bleeding.conf
+++ b/meta/conf/distro/poky-bleeding.conf
@@ -5,17 +5,4 @@ PREFERRED_VERSION_cairo ?= "1.3.10"
PREFERRED_VERSION_pango ?= "1.15.2"
PREFERRED_VERSION_gtk+ ?= "2.10.6"
-PREFERRED_VERSION_dbus ?= "1.0.1"
-PREFERRED_VERSION_dbus-native ?= "1.0.1"
-
-PREFERRED_PROVIDER_dbus-glib ?= "dbus-glib"
-PREFERRED_VERSION_dbus-glib ?= "0.7.2"
-PREFERRED_VERSION_dbus-glib-native ?= "0.7.2"
-
-SRCDATE_gconf-dbus ?= "20061219"
-
-PREFERRED_PROVIDER_gnome-vfs ?= "gnome-vfs"
-PREFERRED_VERSION_gnome-vfs ?= "2.16.3"
-PREFERRED_PROVIDER_gnome-vfs-plugin-dbus ?= "gnome-vfs"
-
require conf/distro/poky.conf
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index bac19f459e..de2a6a6c69 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -59,18 +59,16 @@ PREFERRED_PROVIDER_virtual/update-alternatives-native ?= update-alternatives-cwo
# Others:
PREFERRED_PROVIDER_libx11 ?= "diet-x11"
+PREFERRED_PROVIDER_dbus-glib ?= "dbus-glib"
PREFERRED_PROVIDER_gconf ?= "gconf-dbus"
-PREFERRED_PROVIDER_gnome-vfs ?= "gnome-vfs-dbus"
-PREFERRED_PROVIDER_gnome-vfs-plugin-dbus = "gnome-vfs-dbus"
+PREFERRED_PROVIDER_gnome-vfs ?= "gnome-vfs"
PREFERRED_PROVIDER_tslib ?= "tslib"
#
# CVS Dates to use:
#
-#SRCDATE_gnome-vfs-dbus ?= "20051215"
-SRCDATE_gconf-dbus ?= "20060119"
-SRCDATE_gnome-vfs-dbus ?= "20060119"
+SRCDATE_gconf-dbus ?= "20061219"
SRCDATE_contacts ?= "20060707"
SRCDATE_dates ?= "20060721"
SRCDATE_gtkhtml2 ?= "20060323"
@@ -143,9 +141,11 @@ PREFERRED_VERSION_gtk+ ?= "2.6.8"
#PREFERRED_VERSION_gtk+ ?= "2.8.16"
PREFERRED_VERSION_pango ?= "1.10.2"
-PREFERRED_VERSION_dbus ?= "0.60"
-PREFERRED_PROVIDER_dbus-glib ?= "dbus"
-PREFERRED_VERSION_gnome-vfs-dbus ?= "2.12.0+cvs${SRCDATE}"
+PREFERRED_VERSION_dbus ?= "1.0.1"
+PREFERRED_VERSION_dbus-native ?= "1.0.1"
+PREFERRED_VERSION_dbus-glib ?= "0.72"
+PREFERRED_VERSION_dbus-glib-native ?= "0.72"
+PREFERRED_VERSION_gnome-vfs ?= "2.16.3"
PREFERRED_VERSION_dillo2 ?= "0.6.6"
PREFERRED_VERSION_evince ?= "0.3.2"