From: Matt Reimer <mattjreimer@gmail.com>
Date: Fri, 1 Sep 2006 21:32:31 +0000 (+0000)
Subject: familiar-unstable.conf: Specify a provider for dbus-glib, so it doesn't try
X-Git-Tag: Release-2010-05/1~9453^2~875^2~93
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=890d766f7d6e3c35309d0155e5751e9d76376aa8;p=openembedded.git

familiar-unstable.conf: Specify a provider for dbus-glib, so it doesn't try
to pull in a second, older version of dbus.
---

diff --git a/conf/distro/familiar-unstable.conf b/conf/distro/familiar-unstable.conf
index 010d3b4708..8041ca8fb6 100644
--- a/conf/distro/familiar-unstable.conf
+++ b/conf/distro/familiar-unstable.conf
@@ -78,6 +78,7 @@ require conf/distro/include/preferred-opie-versions.inc
 PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive"
 PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus"
 PREFERRED_PROVIDER_virtual/libx11 = "diet-x11"
+PREFERRED_PROVIDER_dbus-glib = "dbus-glib"
 require conf/distro/include/preferred-gpe-versions-2.8.inc
 
 #