Merge version 1.15.8-3+rpi1 and 1.15.8-4 to produce 1.15.8-4+rpi1

diff --cc debian/changelog
index e4a2bd150b4f61fb4cbdffbdf824bcdad725935c,ad575704ec16b37ca0e27279261a39af7881a4d5..4cd05f6a8229b90568aabbd2ee1a977672596b00
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,14 -1,15 +1,27 @@@
- golang-1.15 (1.15.8-3+rpi1) bullseye-staging; urgency=medium
++golang-1.15 (1.15.8-4+rpi1) bullseye-staging; urgency=medium
 +
 +  [changes brought forward from golang-1.10 1.10~rc2-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 24 Feb 2018 12:22:04 +0000]
 +  * Build with GOARM=6
 +  * Disable testsuite.
 +  * Fix clean target.
 +
 +  [changes introduced in golang-1.12 1.12.7-3+rpi1 by Peter Michael Green]
 +  * Further clean target fixing.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Wed, 17 Feb 2021 07:04:20 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 01 Mar 2021 14:34:01 +0000
++
+ golang-1.15 (1.15.8-4) unstable; urgency=medium
+ 
+   * Team upload.
+   * Revert "0007-cmd-link-check-CGO_CFLAGS-for-non-g-I-O-options-befo.patch"
+     This patch causes:
+     1. unexpected error message, which makes some packages FTBFS
+        loadinternal: cannot find runtime/cgo
+        Closes: #982701, #982714, #982720, #982724, #982734
+     2. unable to build package on riscv64
+        external linking not supported for linux/riscv64
+ 
+  -- Shengjing Zhu <zhsj@debian.org>  Mon, 15 Feb 2021 23:19:39 +0800
  
  golang-1.15 (1.15.8-3) unstable; urgency=high