Merge version 1.21.6-1+rpi1 and 1.21.7-1 to produce 1.21.7-1+rpi1

diff --cc debian/changelog
index e142ab22a3f6b1c0772a5d59d616b6f60ee40bac,3a56ce1272240af8b1316f2fca6b13abf0810de0..91d864eaac7f07de0247f2f6dd42608e1f5bf823
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,16 @@@
- golang-1.21 (1.21.6-1+rpi1) trixie-staging; urgency=medium
++golang-1.21 (1.21.7-1+rpi1) trixie-staging; urgency=medium
 +
 +  [changes brought forward from 1.21.1-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 07 Oct 2023 14:01:26 +0000]
 +  * Disable testsuite.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sat, 20 Jan 2024 01:01:58 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 29 Feb 2024 13:52:11 +0000
++
+ golang-1.21 (1.21.7-1) unstable; urgency=medium
+ 
+   * Team upload
+   * New upstream version 1.21.7
+ 
+  -- Shengjing Zhu <zhsj@debian.org>  Wed, 21 Feb 2024 16:35:15 +0800
  
  golang-1.21 (1.21.6-1) unstable; urgency=medium