From: Koen Kooi <koen@openembedded.org>
Date: Tue, 7 Apr 2009 15:54:08 +0000 (+0200)
Subject: gnome-bluetooth: add RCONFLICTS with bluez-gnome
X-Git-Tag: Release-2010-05/1~3789^2~38^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=30cdb3a5af28adf023c562c1d61af231f7dce0dd;p=openembedded.git

gnome-bluetooth: add RCONFLICTS with bluez-gnome
---

diff --git a/recipes/gnome/gnome-bluetooth_2.27.1.bb b/recipes/gnome/gnome-bluetooth_2.27.1.bb
index a5c41d56e5..9a435c7f9c 100644
--- a/recipes/gnome/gnome-bluetooth_2.27.1.bb
+++ b/recipes/gnome/gnome-bluetooth_2.27.1.bb
@@ -1,9 +1,12 @@
 LICENSE = "GPL"
 SECTION = "x11/gnome"
 
+PR = "r1"
+
 inherit autotools gnome pkgconfig
 
 DEPENDS = "gconf-dbus gtk+ dbus-glib libunique libnotify hal bluez4 gnome-keyring"
+RCONFLICTS_${PN} = "bluez-gnome"
 
 do_configure_prepend() {
     sed -i -e s:docs::g ${S}/Makefile.am