summaryrefslogtreecommitdiffstats
path: root/openembedded
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2006-01-19 22:08:09 +0000
committerRichard Purdie <richard@openedhand.com>2006-01-19 22:08:09 +0000
commitccc65d0e6f6c8814897be41486c8acd74e9f42d1 (patch)
treee3e2fc133444edf47d9cbcd9ed55ee25abe0fc53 /openembedded
parent8fcb232416eea3b811cd361b21471a5f32dd854f (diff)
downloadpoky-ccc65d0e6f6c8814897be41486c8acd74e9f42d1.tar.gz
Update poky.conf to move to dbus-0.60 along with the appropriate dbus versions of gnome-vfs and gconf. Also fix the CVSDATES of those packages to known working ones.
git-svn-id: https://svn.o-hand.com/repos/poky@229 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'openembedded')
-rw-r--r--openembedded/conf/distro/poky.conf8
1 files changed, 5 insertions, 3 deletions
diff --git a/openembedded/conf/distro/poky.conf b/openembedded/conf/distro/poky.conf
index 82462bdd53..6b538f2b0c 100644
--- a/openembedded/conf/distro/poky.conf
+++ b/openembedded/conf/distro/poky.conf
@@ -66,14 +66,16 @@ PREFERRED_PROVIDER_virtual/libiconv=glibc
66PREFERRED_PROVIDER_virtual/libintl=glibc 66PREFERRED_PROVIDER_virtual/libintl=glibc
67PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive" 67PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive"
68PREFERRED_PROVIDER_x11 = "diet-x11" 68PREFERRED_PROVIDER_x11 = "diet-x11"
69#PREFERRED_PROVIDER_gconf=gconf-dbus 69PREFERRED_PROVIDER_gconf=gconf-dbus
70PREFERRED_PROVIDER_gnome-vfs=gnome-vfs-dbus 70PREFERRED_PROVIDER_gnome-vfs=gnome-vfs-dbus
71 71
72 72
73# 73#
74# CVS Dates to use: 74# CVS Dates to use:
75# 75#
76CVSDATE_gnome-vfs-dbus = "20051215" 76#CVSDATE_gnome-vfs-dbus = "20051215"
77CVSDATE_gconf-dbus = "20060119"
78CVSDATE_gnome-vfs-dbus = "20060119"
77CVSDATE_minimo = "20050401" 79CVSDATE_minimo = "20050401"
78CVSDATE_ipkg-utils-native = "20050930" 80CVSDATE_ipkg-utils-native = "20050930"
79CVSDATE_ipkg-link-1 = "20050930" 81CVSDATE_ipkg-link-1 = "20050930"
@@ -128,7 +130,7 @@ PREFERRED_VERSION_glib-2.0 = "2.8.1"
128PREFERRED_VERSION_gtk+ = "2.8.9" 130PREFERRED_VERSION_gtk+ = "2.8.9"
129PREFERRED_VERSION_pango = "1.10.0" 131PREFERRED_VERSION_pango = "1.10.0"
130 132
131PREFERRED_VERSION_dbus = "0.50" 133PREFERRED_VERSION_dbus = "0.60"
132 134
133PREFERRED_VERSION_diet-x11 ?= "6.2.1" 135PREFERRED_VERSION_diet-x11 ?= "6.2.1"
134PREFERRED_VERSION_dillo2 ?= "0.6.6" 136PREFERRED_VERSION_dillo2 ?= "0.6.6"