angstrom-2006.9: prefer dbus 0.92

diff --git a/conf/distro/angstrom-2006.9.conf b/conf/distro/angstrom-2006.9.conf
index 4f732ec..4abeea6 100644 (file)
--- a/conf/distro/angstrom-2006.9.conf
+++ b/conf/distro/angstrom-2006.9.conf
@@ -46,6 +46,8 @@ require conf/distro/include/preferred-opie-versions.inc
 # GPE
 require conf/distro/include/preferred-gpe-versions-2.8.inc
 
+PREFERRED_PROVIDER_dbus-glib = "dbus-glib"
+
 PREFERRED_VERSION_fontconfig = "2.3.95"
 PREFERRED_VERSION_freetype = "2.2.1"
 
@@ -55,10 +57,12 @@ PREFERRED_PROVIDER_xserver ?= "xserver-kdrive"
 
 require conf/distro/include/preferred-xorg-versions-X11R7.1.inc
 
+PREFERRED_VERSION_xserver-kdrive = "1.1.0+git${SRCDATE}"
 
 #zap extra stuff taking place in $MACHINE.conf 
 GPE_EXTRA_INSTALL = ""
 
+
 # E
 require conf/distro/include/preferred-e-versions.inc
 
@@ -120,7 +124,7 @@ PREFERRED_VERSION_busybox = "1.2.1"
 
 PREFERRED_VERSION_orinoco-modules_h3600 = "0.13e"
 PREFERRED_VERSION_orinoco-modules_h3900 = "0.13e"
-PREFERRED_VERSION_dbus ?= "0.91"
+PREFERRED_VERSION_dbus ?= "0.92"
 PREFERRED_VERSION_gstreamer ?= "0.10.6"
 
 PREFERRED_PROVIDER_hostap-conf ?= "hostap-conf"
@@ -144,11 +148,11 @@ PCMCIA_MANAGER_h6300 = "pcmciautils"
 PCMCIA_MANAGER_ipaq-pxa270 = "pcmciautils"
 
 # add altboot to compatible models, will be replaced with angstrom-bootmanager
-EXTRA_STUFF_append_c7x0 = "altboot"
-EXTRA_STUFF_append_akita = "altboot"
-EXTRA_STUFF_append_spitz = "altboot"
-EXTRA_STUFF_append_poodle = "altboot"
-EXTRA_STUFF_append_tosa = "altboot"
+#EXTRA_STUFF_append_c7x0 = "altboot"
+#EXTRA_STUFF_append_akita = "altboot"
+#EXTRA_STUFF_append_spitz = "altboot"
+#EXTRA_STUFF_append_poodle = "altboot"
+#EXTRA_STUFF_append_tosa = "altboot"
 
 ### GPE section ###