From a5af9cfb4c9da5590335d4e1df88c61aaf7dcb12 Mon Sep 17 00:00:00 2001
From: Dongxiao Xu <dongxiao.xu@intel.com>
Date: Sat, 26 Jun 2010 16:04:00 +0800
Subject: [PATCH] bluez4: Upgraded to version 4.66

Change the local file directory name to ${PN}-${PV}
Comment for local patches

Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
---
 meta/packages/bluez/{bluez4 => bluez4-4.66}/bluetooth.conf  | 0
 .../fix-dfutool-usb-declaration-mismatch.patch              | 6 ++++++
 .../bluez/{bluez4 => bluez4-4.66}/hid2hci_usb_init.patch    | 0
 meta/packages/bluez/{bluez4 => bluez4-4.66}/sbc-thumb.patch | 2 ++
 meta/packages/bluez/{bluez4_4.56.bb => bluez4_4.66.bb}      | 2 ++
 5 files changed, 10 insertions(+)
 rename meta/packages/bluez/{bluez4 => bluez4-4.66}/bluetooth.conf (100%)
 rename meta/packages/bluez/{bluez4 => bluez4-4.66}/fix-dfutool-usb-declaration-mismatch.patch (63%)
 rename meta/packages/bluez/{bluez4 => bluez4-4.66}/hid2hci_usb_init.patch (100%)
 rename meta/packages/bluez/{bluez4 => bluez4-4.66}/sbc-thumb.patch (92%)
 rename meta/packages/bluez/{bluez4_4.56.bb => bluez4_4.66.bb} (99%)

diff --git a/meta/packages/bluez/bluez4/bluetooth.conf b/meta/packages/bluez/bluez4-4.66/bluetooth.conf
similarity index 100%
rename from meta/packages/bluez/bluez4/bluetooth.conf
rename to meta/packages/bluez/bluez4-4.66/bluetooth.conf
diff --git a/meta/packages/bluez/bluez4/fix-dfutool-usb-declaration-mismatch.patch b/meta/packages/bluez/bluez4-4.66/fix-dfutool-usb-declaration-mismatch.patch
similarity index 63%
rename from meta/packages/bluez/bluez4/fix-dfutool-usb-declaration-mismatch.patch
rename to meta/packages/bluez/bluez4-4.66/fix-dfutool-usb-declaration-mismatch.patch
index b1ee510e8b..91c802bc41 100644
--- a/meta/packages/bluez/bluez4/fix-dfutool-usb-declaration-mismatch.patch
+++ b/meta/packages/bluez/bluez4-4.66/fix-dfutool-usb-declaration-mismatch.patch
@@ -1,3 +1,9 @@
+# bluez4: add compile patch fixing some usb declaration mismatch
+# Author: Michael 'Mickey' Lauer <mickey@vanille-media.de>
+# Date:   Thu Jan 29 16:52:21 2009 +0000
+#
+# Acquired from OpenEmbedded
+
 Index: bluez-4.27/tools/dfutool.c
 ===================================================================
 --- bluez-4.27.orig/tools/dfutool.c
diff --git a/meta/packages/bluez/bluez4/hid2hci_usb_init.patch b/meta/packages/bluez/bluez4-4.66/hid2hci_usb_init.patch
similarity index 100%
rename from meta/packages/bluez/bluez4/hid2hci_usb_init.patch
rename to meta/packages/bluez/bluez4-4.66/hid2hci_usb_init.patch
diff --git a/meta/packages/bluez/bluez4/sbc-thumb.patch b/meta/packages/bluez/bluez4-4.66/sbc-thumb.patch
similarity index 92%
rename from meta/packages/bluez/bluez4/sbc-thumb.patch
rename to meta/packages/bluez/bluez4-4.66/sbc-thumb.patch
index 3505426053..474423670b 100644
--- a/meta/packages/bluez/bluez4/sbc-thumb.patch
+++ b/meta/packages/bluez/bluez4-4.66/sbc-thumb.patch
@@ -1,3 +1,5 @@
+# Acquired from OpenEmbedded
+
 --- bluez/sbc/sbc_math.h~	2008-03-05 20:18:03.000000000 +0000
 +++ bluez/sbc/sbc_math.h	2008-10-27 13:39:27.000000000 +0000
 @@ -59,7 +59,7 @@
diff --git a/meta/packages/bluez/bluez4_4.56.bb b/meta/packages/bluez/bluez4_4.66.bb
similarity index 99%
rename from meta/packages/bluez/bluez4_4.56.bb
rename to meta/packages/bluez/bluez4_4.66.bb
index 656c1e82ab..59193c2f99 100644
--- a/meta/packages/bluez/bluez4_4.56.bb
+++ b/meta/packages/bluez/bluez4_4.66.bb
@@ -10,6 +10,8 @@ PROVIDES_append_angstrom = " bluez-utils bluez-libs"
 
 ASNEEDED = ""
 
+PR = "r0"
+
 SRC_URI = "\
   http://www.kernel.org/pub/linux/bluetooth/bluez-${PV}.tar.gz \
   file://fix-dfutool-usb-declaration-mismatch.patch;patch=1 \
-- 
2.40.1