add conflicts for recipes incompatible with bluez5

The following changes since commit 34be57e7454ffe5f591cc0d7638bf41bb4377a61:

meta-networking: update LAYERDEPENDS (2014-11-24 14:12:02 -0500)

are available in the git repository at:

git://git.openembedded.org/meta-openembedded-contrib pabigot/bluez5
http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=pabigot/bluez5

Peter A. Bigot (2):
obexd: conflict with bluez5
obex-data-server: conflict with bluez5

 meta-gnome/recipes-connectivity/obex/obexd_0.48.bb          | 2 ++
 meta-oe/recipes-connectivity/obex/obex-data-server_0.4.6.bb | 1 +
 2 files changed, 3 insertions(+)

1.8.5.5

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

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

index 26869fe..f28f77b 100644
@@ -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"

1.8.5.5

Although this package builds with bluez5, it was removed from Fedora 20
[1] and is not used in bluez5-based GNOME [2], suggesting the bluez5 obexd is to be used instead.

[1] http://pkgs.fedoraproject.org/cgit/obex-data-server.git/log/?h=f20
[2] http://www.hadess.net/2013/11/bluetooth-file-sharing-obexpush-in.html

---
 meta-oe/recipes-connectivity/obex/obex-data-server_0.4.6.bb | 1 +
 1 file changed, 1 insertion(+)

index 4a2b2b1..afe6106 100644
@@ -3,6 +3,7 @@ LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 
 DEPENDS = "gtk+ bluez4 dbus-glib imagemagick openobex"
+RCONFLICTS_${PN} = "bluez5"
 
 SRC_URI = "http://tadas.dailyda.com/software/obex-data-server-${PV}.tar.gz"
 SRC_URI[md5sum] = "961ca5db6fe9c97024e133cc6203cc4d"

1.8.5.5

Ping. These are independent of the RFC patches.