Merge ~jawn-smith/bluez:groovy into ~bluetooth/bluez:groovy

[William Wilson]

LP: #1905627 Adding corrected upstream raspi patches.

This is done to match what is in hirsute.

Unmerged commits

581bafa... by William Wilson on 2021-02-12

LP: #1905627 Adding corrected upstream raspi patches

diff --git a/debian/changelog b/debian/changelog
index f43f1db..c3b7583 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+bluez (5.55-0ubuntu1.2) UNRELEASED; urgency=medium
+
+  * Correctly include the updated patches now (LP: #1905627)
+
+ -- William 'jawn-smith' Wilson <[e-mail]>  Fri, 12 Feb 2021 15:18:36 -0600
+
 bluez (5.55-0ubuntu1.1) groovy; urgency=medium
 
   * Added patches from the Raspberry Pi Foundation
diff --git a/debian/patches/raspi-bcm43xx-3wire.patch b/debian/patches/raspi-bcm43xx-3wire.patch
index 32405bd..21571a4 100644
--- a/debian/patches/raspi-bcm43xx-3wire.patch
+++ b/debian/patches/raspi-bcm43xx-3wire.patch
@@ -1,5 +1,5 @@
 Author: Simon Long <[e-mail]>
-Forwarded: no
+Forwarded: https://patchwork.kernel.org/project/bluetooth/patch/[e-mail]/
 Last-Update: 2017-04-05
 Description: Patches to add BCM43xx 3-wire variant
  This patch adds the bcm43xx-3wire variant to the hciattach tool; this is
diff --git a/debian/patches/raspi-bcm43xx-load-firmware.patch b/debian/patches/raspi-bcm43xx-load-firmware.patch
index b673a3d..44ee52a 100644
--- a/debian/patches/raspi-bcm43xx-load-firmware.patch
+++ b/debian/patches/raspi-bcm43xx-load-firmware.patch
@@ -1,6 +1,6 @@
 Author: Simon Long <[e-mail]>
-Forwarded: no
-Last-Update: 2017-04-05
+Forwarded: https://patchwork.kernel.org/project/bluetooth/patch/[e-mail]/
+Last-Update: 2020-12-18
 Description: Patches for loading the bcm43xx firmware
  This patch corrects the location of the firmware from /etc/firmware to
  /lib/firmware, and disables setting the UART interface speed *before* loading
@@ -29,11 +29,3 @@ Description: Patches for loading the bcm43xx firmware
  		if (bcm43xx_load_firmware(fd, fw_path))
  			return -1;
  
-@@ -381,6 +378,7 @@
- 			return -1;
- 		}
- 
-+		sleep(1);
- 		if (bcm43xx_reset(fd))
- 			return -1;
- 	}
diff --git a/debian/patches/raspi-cypress-305-bdaddr.patch b/debian/patches/raspi-cypress-305-bdaddr.patch
index 9267f19..c8ef6d4 100644
--- a/debian/patches/raspi-cypress-305-bdaddr.patch
+++ b/debian/patches/raspi-cypress-305-bdaddr.patch
@@ -1,5 +1,5 @@
 From: Phil Elwell <[e-mail]>
-Forwarded: no
+Forwarded: https://patchwork.kernel.org/project/bluetooth/patch/[e-mail]/
 Subject: Patch Cypress 305 devices to behave as Broadcom devices
 
 ---