bluez: update and put related .bb files into one directory

- bluez-libs, bluez-utils, and bluez-hcidump are pretty tied, so I think it makes sense to put them into the same directory
- update bluez-libs to 2.20
- update bluez-hcidump to 1.25
- enable default-manfid patch

26 files changed, 19 insertions, 16 deletions

diff --git a/packages/bluez-utils/bluez-utils-nodbus_2.18.bb b/packages/bluez-utils/bluez-utils-nodbus_2.18.bb
deleted file mode 100644
index 6334a4a499..0000000000
--- a/packages/bluez-utils/bluez-utils-nodbus_2.18.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-include bluez-utils-common_${PV}.inc
-
-EXTRA_OECONF += "--without-dbus"
-
diff --git a/packages/bluez-utils/files/openmn/.mtn2git_empty b/packages/bluez-utils/files/openmn/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/bluez-utils/files/openmn/.mtn2git_empty
+++ /dev/null
diff --git a/packages/bluez-utils/files/openslug/.mtn2git_empty b/packages/bluez-utils/files/openslug/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/bluez-utils/files/openslug/.mtn2git_empty
+++ /dev/null
diff --git a/packages/bluez-hcidump/.mtn2git_empty b/packages/bluez/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/bluez-hcidump/.mtn2git_empty
+++ b/packages/bluez/.mtn2git_empty
diff --git a/packages/bluez-hcidump/bluez-hcidump_1.23.bb b/packages/bluez/bluez-hcidump_1.25.bb
index 0cbc0fd6ec..0cbc0fd6ec 100644
--- a/packages/bluez-hcidump/bluez-hcidump_1.23.bb
+++ b/packages/bluez/bluez-hcidump_1.25.bb
diff --git a/packages/bluez-libs/bluez-libs_2.18.bb b/packages/bluez/bluez-libs_2.20.bb
index d740bd80a9..d740bd80a9 100644
--- a/packages/bluez-libs/bluez-libs_2.18.bb
+++ b/packages/bluez/bluez-libs_2.20.bb
diff --git a/packages/bluez-libs/.mtn2git_empty b/packages/bluez/bluez-utils-dbus/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/bluez-libs/.mtn2git_empty
+++ b/packages/bluez/bluez-utils-dbus/.mtn2git_empty
diff --git a/packages/bluez-utils/bluez-utils-dbus/dbus.patch b/packages/bluez/bluez-utils-dbus/dbus.patch
index f5d670c13f..c5ab129469 100644
--- a/packages/bluez-utils/bluez-utils-dbus/dbus.patch
+++ b/packages/bluez/bluez-utils-dbus/dbus.patch
@@ -1,6 +1,11 @@
---- bluez-utils-2.18/acinclude.m4.old	2005-07-11 12:15:00.000000000 +0200
-+++ bluez-utils-2.18/acinclude.m4	2005-07-11 12:18:48.000000000 +0200
-@@ -211,48 +211,17 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- bluez-utils-2.20/acinclude.m4~dbus.patch
++++ bluez-utils-2.20/acinclude.m4
+@@ -211,46 +211,15 @@
  ])
  
  AC_DEFUN([AC_PATH_DBUS], [
@@ -23,10 +28,10 @@
 -		test -d "${dbus_prefix}/lib64/dbus-1.0/include" && DBUS_CFLAGS="$DBUS_CFLAGS -I${dbus_prefix}/lib64/dbus-1.0/include"
 -		test -d "${dbus_prefix}/lib/dbus-1.0/include" && DBUS_CFLAGS="$DBUS_CFLAGS -I${dbus_prefix}/lib/dbus-1.0/include"
 -	fi
- 
 +	if pkg-config --exists dbus-1; then
 +	dbus_found=yes ; DBUS_CFLAGS="`pkg-config --cflags dbus-1` -DDBUS_API_SUBJECT_TO_CHANGE"
 +	DBUS_LIBS="`pkg-config --libs dbus-1`"
+ 
  	CPPFLAGS="$CPPFLAGS $DBUS_CFLAGS"
 -	AC_CHECK_HEADER(dbus/dbus.h, dbus_found=yes, dbus_found=no)
 -
@@ -37,16 +42,14 @@
 -		test -d "${dbus_prefix}/lib64" && DBUS_LIBS="$DBUS_LIBS -L${dbus_prefix}/lib64"
 -		test -d "${dbus_prefix}/lib" && DBUS_LIBS="$DBUS_LIBS -L${dbus_prefix}/lib"
 -	fi
- 
+-
  	LDFLAGS="$LDFLAGS $DBUS_LIBS"
 -	AC_CHECK_LIB(dbus-1, dbus_error_init, DBUS_LIBS="$DBUS_LIBS -ldbus-1", dbus_found=no)
--	AC_CHECK_LIB(dbus-1, dbus_pending_call_steal_reply, AC_DEFINE(HAVE_DBUS_PENDING_CALL_STEAL_REPLY, 1, [Define to 1 if you have the dbus_pending_call_steal_reply() function.]))
 -	AC_CHECK_LIB(dbus-1, dbus_message_iter_get_basic, AC_DEFINE(HAVE_DBUS_MESSAGE_ITER_GET_BASIC, 1, [Define to 1 if you have the dbus_message_iter_get_basic() function.]))
--	AC_CHECK_LIB(dbus-1, dbus_message_append_args, AC_DEFINE(HAVE_DBUS_MESSAGE_APPEND_ARGS, 1, [Define to 1 if you have the dbus_message_append_args() function.]))
 -
 -	CPPFLAGS=$ac_save_CPPFLAGS
 -	LDFLAGS=$ac_save_LDFLAGS
- 
+-
  	AC_SUBST(DBUS_CFLAGS)
  	AC_SUBST(DBUS_LIBS)
 +	fi
diff --git a/packages/bluez-utils/bluez-utils-dbus/hcid.conf b/packages/bluez/bluez-utils-dbus/hcid.conf
index ab3ca2aaee..ab3ca2aaee 100644
--- a/packages/bluez-utils/bluez-utils-dbus/hcid.conf
+++ b/packages/bluez/bluez-utils-dbus/hcid.conf
diff --git a/packages/bluez-utils/bluez-utils-dbus/smash.patch b/packages/bluez/bluez-utils-dbus/smash.patch
index 55cdbb7284..55cdbb7284 100644
--- a/packages/bluez-utils/bluez-utils-dbus/smash.patch
+++ b/packages/bluez/bluez-utils-dbus/smash.patch
diff --git a/packages/bluez-utils/bluez-utils-dbus_2.18.bb b/packages/bluez/bluez-utils-dbus_2.20.bb
index f405cd5133..e54ff67085 100644
--- a/packages/bluez-utils/bluez-utils-dbus_2.18.bb
+++ b/packages/bluez/bluez-utils-dbus_2.20.bb
@@ -1,4 +1,4 @@
-include bluez-utils-common_${PV}.inc
+include bluez-utils.inc
 DEPENDS += "dbus"
 SRC_URI += "file://dbus.patch;patch=1 file://smash.patch;patch=1"
 EXTRA_OECONF += "--with-dbus"
diff --git a/packages/bluez/bluez-utils-nodbus_2.20.bb b/packages/bluez/bluez-utils-nodbus_2.20.bb
new file mode 100644
index 0000000000..487ace6e15
--- /dev/null
+++ b/packages/bluez/bluez-utils-nodbus_2.20.bb
@@ -0,0 +1,4 @@
+include bluez-utils.inc
+
+EXTRA_OECONF += "--without-dbus"
+
diff --git a/packages/bluez-utils/bluez-utils-common_2.18.inc b/packages/bluez/bluez-utils.inc
index 9f99081e84..b5a5e14970 100644
--- a/packages/bluez-utils/bluez-utils-common_2.18.inc
+++ b/packages/bluez/bluez-utils.inc
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 DEPENDS = "bluez-libs-${PV} pcmcia-cs"
 RPROVIDES_${PN} = "bluez-pan bluez-sdp bluez-utils"
 LICENSE = "GPL"
-PR = "r5"
+PR = "r6"
 
 SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \
 	file://base.patch;patch=1 \
@@ -15,8 +15,8 @@ SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \
 
 # Almost all serial CF cards w/ manfid 0x0000,0x0000 seem to use the bcs protocol
 # Let's default to that instead of 'any' and see if we break something with that
-SRC_URI_append_familiar   = " file://default-manfid-0x0-to-bcps.patch"
-SRC_URI_append_openzaurus = " file://default-manfid-0x0-to-bcps.patch"
+SRC_URI_append_familiar   = " file://default-manfid-0x0-to-bcps.patch;patch=1"
+SRC_URI_append_openzaurus = " file://default-manfid-0x0-to-bcps.patch;patch=1"
 
 S = "${WORKDIR}/bluez-utils-${PV}"
 
diff --git a/packages/bluez-utils/.mtn2git_empty b/packages/bluez/files/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/bluez-utils/.mtn2git_empty
+++ b/packages/bluez/files/.mtn2git_empty
diff --git a/packages/bluez-utils/files/base.patch b/packages/bluez/files/base.patch
index 337c9aa73e..337c9aa73e 100644
--- a/packages/bluez-utils/files/base.patch
+++ b/packages/bluez/files/base.patch
diff --git a/packages/bluez-utils/files/blueboxes.patch b/packages/bluez/files/blueboxes.patch
index c429b06c06..c429b06c06 100644
--- a/packages/bluez-utils/files/blueboxes.patch
+++ b/packages/bluez/files/blueboxes.patch
diff --git a/packages/bluez-utils/files/bluetooth.conf b/packages/bluez/files/bluetooth.conf
index bae8fae08e..bae8fae08e 100644
--- a/packages/bluez-utils/files/bluetooth.conf
+++ b/packages/bluez/files/bluetooth.conf
diff --git a/packages/bluez-utils/files/bluetooth.default b/packages/bluez/files/bluetooth.default
index 4817d38c60..4817d38c60 100644
--- a/packages/bluez-utils/files/bluetooth.default
+++ b/packages/bluez/files/bluetooth.default
diff --git a/packages/bluez-utils/files/default-manfid-0x0-to-bcps.patch b/packages/bluez/files/default-manfid-0x0-to-bcps.patch
index 3d993543b3..3d993543b3 100644
--- a/packages/bluez-utils/files/default-manfid-0x0-to-bcps.patch
+++ b/packages/bluez/files/default-manfid-0x0-to-bcps.patch
diff --git a/packages/bluez-utils/files/hcid.conf b/packages/bluez/files/hcid.conf
index 44e9c46fb0..44e9c46fb0 100644
--- a/packages/bluez-utils/files/hcid.conf
+++ b/packages/bluez/files/hcid.conf
diff --git a/packages/bluez-utils/bluez-utils-dbus/.mtn2git_empty b/packages/bluez/files/openmn/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/bluez-utils/bluez-utils-dbus/.mtn2git_empty
+++ b/packages/bluez/files/openmn/.mtn2git_empty
diff --git a/packages/bluez-utils/files/openmn/bluetooth.default b/packages/bluez/files/openmn/bluetooth.default
index 06c52d7960..06c52d7960 100644
--- a/packages/bluez-utils/files/openmn/bluetooth.default
+++ b/packages/bluez/files/openmn/bluetooth.default
diff --git a/packages/bluez-utils/files/openmn/hcid.conf b/packages/bluez/files/openmn/hcid.conf
index 46a5d5fd54..46a5d5fd54 100644
--- a/packages/bluez-utils/files/openmn/hcid.conf
+++ b/packages/bluez/files/openmn/hcid.conf
diff --git a/packages/bluez-utils/files/.mtn2git_empty b/packages/bluez/files/openslug/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/bluez-utils/files/.mtn2git_empty
+++ b/packages/bluez/files/openslug/.mtn2git_empty
diff --git a/packages/bluez-utils/files/openslug/bluetooth.default b/packages/bluez/files/openslug/bluetooth.default
index 10f628e314..10f628e314 100644
--- a/packages/bluez-utils/files/openslug/bluetooth.default
+++ b/packages/bluez/files/openslug/bluetooth.default
diff --git a/packages/bluez-utils/files/openslug/hcid.conf b/packages/bluez/files/openslug/hcid.conf
index 46a5d5fd54..46a5d5fd54 100644
--- a/packages/bluez-utils/files/openslug/hcid.conf
+++ b/packages/bluez/files/openslug/hcid.conf