summaryrefslogtreecommitdiffstats
path: root/meta-gnome
diff options
context:
space:
mode:
authorPeter Bigot <pab@pabigot.com>2014-11-26 14:06:29 -0600
committerMartin Jansa <Martin.Jansa@gmail.com>2014-12-10 13:33:28 +0100
commit5d04db1f258ab2d90dcdd07e9259623cd0a5c3da (patch)
tree42cffea5db92913a10a7e4ed3fae1acce14281d5 /meta-gnome
parentec2b501573d075b5cbc71bbe58c57896dc431247 (diff)
downloadmeta-openembedded-5d04db1f258ab2d90dcdd07e9259623cd0a5c3da.tar.gz
obexd: conflict with bluez5
obexd was integrated into bluez5 and is no longer a separate package. Signed-off-by: Peter A. Bigot <pab@pabigot.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-gnome')
-rw-r--r--meta-gnome/recipes-connectivity/obex/obexd_0.48.bb2
1 files changed, 2 insertions, 0 deletions
diff --git a/meta-gnome/recipes-connectivity/obex/obexd_0.48.bb b/meta-gnome/recipes-connectivity/obex/obexd_0.48.bb
index 26869fe11..f28f77b8c 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 @@
1SUMMARY = "OBEX Server and Client" 1SUMMARY = "OBEX Server and Client"
2# obexd was integrated into bluez5
2DEPENDS = "glib-2.0 dbus bluez4 libical" 3DEPENDS = "glib-2.0 dbus bluez4 libical"
4RCONFLICTS_${PN} = "bluez5"
3 5
4LICENSE = "GPLv2" 6LICENSE = "GPLv2"
5LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e" 7LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e"