summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2009-04-07 17:54:08 +0200
committerKoen Kooi <koen@openembedded.org>2009-04-07 17:54:08 +0200
commit30cdb3a5af28adf023c562c1d61af231f7dce0dd (patch)
treeb29217e156320f284b66aa1635fa1e5e9cd17b12
parent936d7a45a1667a594a91fd3a57521d4c36aaf4c6 (diff)
gnome-bluetooth: add RCONFLICTS with bluez-gnome
-rw-r--r--recipes/gnome/gnome-bluetooth_2.27.1.bb3
1 files changed, 3 insertions, 0 deletions
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