summaryrefslogtreecommitdiff
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)
downloadopenembedded-core-ccc65d0e6f6c8814897be41486c8acd74e9f42d1.tar.gz
openembedded-core-ccc65d0e6f6c8814897be41486c8acd74e9f42d1.tar.bz2
openembedded-core-ccc65d0e6f6c8814897be41486c8acd74e9f42d1.tar.xz
openembedded-core-ccc65d0e6f6c8814897be41486c8acd74e9f42d1.zip
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 82462bdd5..6b538f2b0 100644
--- a/openembedded/conf/distro/poky.conf
+++ b/openembedded/conf/distro/poky.conf
@@ -66,14 +66,16 @@ PREFERRED_PROVIDER_virtual/libiconv=glibc
PREFERRED_PROVIDER_virtual/libintl=glibc
PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive"
PREFERRED_PROVIDER_x11 = "diet-x11"
-#PREFERRED_PROVIDER_gconf=gconf-dbus
+PREFERRED_PROVIDER_gconf=gconf-dbus
PREFERRED_PROVIDER_gnome-vfs=gnome-vfs-dbus
#
# CVS Dates to use:
#
-CVSDATE_gnome-vfs-dbus = "20051215"
+#CVSDATE_gnome-vfs-dbus = "20051215"
+CVSDATE_gconf-dbus = "20060119"
+CVSDATE_gnome-vfs-dbus = "20060119"
CVSDATE_minimo = "20050401"
CVSDATE_ipkg-utils-native = "20050930"
CVSDATE_ipkg-link-1 = "20050930"
@@ -128,7 +130,7 @@ PREFERRED_VERSION_glib-2.0 = "2.8.1"
PREFERRED_VERSION_gtk+ = "2.8.9"
PREFERRED_VERSION_pango = "1.10.0"
-PREFERRED_VERSION_dbus = "0.50"
+PREFERRED_VERSION_dbus = "0.60"
PREFERRED_VERSION_diet-x11 ?= "6.2.1"
PREFERRED_VERSION_dillo2 ?= "0.6.6"