diff options
author | Richard Purdie <richard@openedhand.com> | 2006-01-19 22:08:09 +0000 |
---|---|---|
committer | Richard Purdie <richard@openedhand.com> | 2006-01-19 22:08:09 +0000 |
commit | ccc65d0e6f6c8814897be41486c8acd74e9f42d1 (patch) | |
tree | e3e2fc133444edf47d9cbcd9ed55ee25abe0fc53 /openembedded/conf | |
parent | 8fcb232416eea3b811cd361b21471a5f32dd854f (diff) | |
download | poky-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/conf')
-rw-r--r-- | openembedded/conf/distro/poky.conf | 8 |
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 | |||
66 | PREFERRED_PROVIDER_virtual/libintl=glibc | 66 | PREFERRED_PROVIDER_virtual/libintl=glibc |
67 | PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive" | 67 | PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive" |
68 | PREFERRED_PROVIDER_x11 = "diet-x11" | 68 | PREFERRED_PROVIDER_x11 = "diet-x11" |
69 | #PREFERRED_PROVIDER_gconf=gconf-dbus | 69 | PREFERRED_PROVIDER_gconf=gconf-dbus |
70 | PREFERRED_PROVIDER_gnome-vfs=gnome-vfs-dbus | 70 | PREFERRED_PROVIDER_gnome-vfs=gnome-vfs-dbus |
71 | 71 | ||
72 | 72 | ||
73 | # | 73 | # |
74 | # CVS Dates to use: | 74 | # CVS Dates to use: |
75 | # | 75 | # |
76 | CVSDATE_gnome-vfs-dbus = "20051215" | 76 | #CVSDATE_gnome-vfs-dbus = "20051215" |
77 | CVSDATE_gconf-dbus = "20060119" | ||
78 | CVSDATE_gnome-vfs-dbus = "20060119" | ||
77 | CVSDATE_minimo = "20050401" | 79 | CVSDATE_minimo = "20050401" |
78 | CVSDATE_ipkg-utils-native = "20050930" | 80 | CVSDATE_ipkg-utils-native = "20050930" |
79 | CVSDATE_ipkg-link-1 = "20050930" | 81 | CVSDATE_ipkg-link-1 = "20050930" |
@@ -128,7 +130,7 @@ PREFERRED_VERSION_glib-2.0 = "2.8.1" | |||
128 | PREFERRED_VERSION_gtk+ = "2.8.9" | 130 | PREFERRED_VERSION_gtk+ = "2.8.9" |
129 | PREFERRED_VERSION_pango = "1.10.0" | 131 | PREFERRED_VERSION_pango = "1.10.0" |
130 | 132 | ||
131 | PREFERRED_VERSION_dbus = "0.50" | 133 | PREFERRED_VERSION_dbus = "0.60" |
132 | 134 | ||
133 | PREFERRED_VERSION_diet-x11 ?= "6.2.1" | 135 | PREFERRED_VERSION_diet-x11 ?= "6.2.1" |
134 | PREFERRED_VERSION_dillo2 ?= "0.6.6" | 136 | PREFERRED_VERSION_dillo2 ?= "0.6.6" |