summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross@openedhand.com>2007-01-10 11:30:47 (GMT)
committerRoss Burton <ross@openedhand.com>2007-01-10 11:30:47 (GMT)
commit81c9ad8b0f826c1aab3ebe1eff6ccb88141bf0ad (patch)
tree4b127770678f646bd5b5c588fb42ecd9d2a984e7
parentc7e1d674858ddadd6f34bb07715654f376025f59 (diff)
downloadpoky-81c9ad8b0f826c1aab3ebe1eff6ccb88141bf0ad.tar.gz
Upgrade to DBus 1.0 in poky
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1139 311d38ba-8fff-0310-9ca6-ca027cbcb966
-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 7637a0d..3d7ae29 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"
5PREFERRED_VERSION_pango ?= "1.15.2" 5PREFERRED_VERSION_pango ?= "1.15.2"
6PREFERRED_VERSION_gtk+ ?= "2.10.6" 6PREFERRED_VERSION_gtk+ ?= "2.10.6"
7 7
8PREFERRED_VERSION_dbus ?= "1.0.1"
9PREFERRED_VERSION_dbus-native ?= "1.0.1"
10
11PREFERRED_PROVIDER_dbus-glib ?= "dbus-glib"
12PREFERRED_VERSION_dbus-glib ?= "0.7.2"
13PREFERRED_VERSION_dbus-glib-native ?= "0.7.2"
14
15SRCDATE_gconf-dbus ?= "20061219"
16
17PREFERRED_PROVIDER_gnome-vfs ?= "gnome-vfs"
18PREFERRED_VERSION_gnome-vfs ?= "2.16.3"
19PREFERRED_PROVIDER_gnome-vfs-plugin-dbus ?= "gnome-vfs"
20
21require conf/distro/poky.conf 8require conf/distro/poky.conf
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index bac19f4..de2a6a6 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
59 59
60# Others: 60# Others:
61PREFERRED_PROVIDER_libx11 ?= "diet-x11" 61PREFERRED_PROVIDER_libx11 ?= "diet-x11"
62PREFERRED_PROVIDER_dbus-glib ?= "dbus-glib"
62PREFERRED_PROVIDER_gconf ?= "gconf-dbus" 63PREFERRED_PROVIDER_gconf ?= "gconf-dbus"
63PREFERRED_PROVIDER_gnome-vfs ?= "gnome-vfs-dbus" 64PREFERRED_PROVIDER_gnome-vfs ?= "gnome-vfs"
64PREFERRED_PROVIDER_gnome-vfs-plugin-dbus = "gnome-vfs-dbus"
65PREFERRED_PROVIDER_tslib ?= "tslib" 65PREFERRED_PROVIDER_tslib ?= "tslib"
66 66
67 67
68# 68#
69# CVS Dates to use: 69# CVS Dates to use:
70# 70#
71#SRCDATE_gnome-vfs-dbus ?= "20051215" 71SRCDATE_gconf-dbus ?= "20061219"
72SRCDATE_gconf-dbus ?= "20060119"
73SRCDATE_gnome-vfs-dbus ?= "20060119"
74SRCDATE_contacts ?= "20060707" 72SRCDATE_contacts ?= "20060707"
75SRCDATE_dates ?= "20060721" 73SRCDATE_dates ?= "20060721"
76SRCDATE_gtkhtml2 ?= "20060323" 74SRCDATE_gtkhtml2 ?= "20060323"
@@ -143,9 +141,11 @@ PREFERRED_VERSION_gtk+ ?= "2.6.8"
143#PREFERRED_VERSION_gtk+ ?= "2.8.16" 141#PREFERRED_VERSION_gtk+ ?= "2.8.16"
144PREFERRED_VERSION_pango ?= "1.10.2" 142PREFERRED_VERSION_pango ?= "1.10.2"
145 143
146PREFERRED_VERSION_dbus ?= "0.60" 144PREFERRED_VERSION_dbus ?= "1.0.1"
147PREFERRED_PROVIDER_dbus-glib ?= "dbus" 145PREFERRED_VERSION_dbus-native ?= "1.0.1"
148PREFERRED_VERSION_gnome-vfs-dbus ?= "2.12.0+cvs${SRCDATE}" 146PREFERRED_VERSION_dbus-glib ?= "0.72"
147PREFERRED_VERSION_dbus-glib-native ?= "0.72"
148PREFERRED_VERSION_gnome-vfs ?= "2.16.3"
149 149
150PREFERRED_VERSION_dillo2 ?= "0.6.6" 150PREFERRED_VERSION_dillo2 ?= "0.6.6"
151PREFERRED_VERSION_evince ?= "0.3.2" 151PREFERRED_VERSION_evince ?= "0.3.2"