[oe-commits] Peter Bigot : obexd: conflict with bluez5

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master-next
Commit: 5d04db1f258ab2d90dcdd07e9259623cd0a5c3da
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=5d04db1f258ab2d90dcdd07e9259623cd0a5c3da

Author: Peter Bigot <pab at pabigot.com>
Date:   Wed Nov 26 14:06:29 2014 -0600

obexd: conflict with bluez5

obexd was integrated into bluez5 and is no longer a separate package.

Signed-off-by: Peter A. Bigot <pab at pabigot.com>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 meta-gnome/recipes-connectivity/obex/obexd_0.48.bb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta-gnome/recipes-connectivity/obex/obexd_0.48.bb b/meta-gnome/recipes-connectivity/obex/obexd_0.48.bb
index 26869fe..f28f77b 100644
--- a/meta-gnome/recipes-connectivity/obex/obexd_0.48.bb
+++ b/meta-gnome/recipes-connectivity/obex/obexd_0.48.bb
@@ -1,5 +1,7 @@
 SUMMARY = "OBEX Server and Client"
+# obexd was integrated into bluez5
 DEPENDS = "glib-2.0 dbus bluez4 libical"
+RCONFLICTS_${PN} = "bluez5"
 
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e"