Merge version 1.21.1-1+rpi1 and 1.21.2-1 to produce 1.21.2-1+rpi1

diff --cc debian/changelog
index 2d62e29a147b6231f00cfce5a82e3ebc607cdc10,845fd6e7694bc855ce09bb6a3fb45d26ac931674..0a8a39a79035863047349a02ac9d9147ead15be0
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,11 +1,18 @@@
- golang-1.21 (1.21.1-1+rpi1) trixie-staging; urgency=medium
++golang-1.21 (1.21.2-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.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Sat, 07 Oct 2023 14:01:26 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 12 Oct 2023 02:51:57 +0000
++
+ golang-1.21 (1.21.2-1) unstable; urgency=medium
+ 
+   * Team upload
+   * New upstream version 1.21.2
+     + CVE-2023-39323: cmd/go: line directives allows arbitrary execution during
+       build
+ 
+  -- Shengjing Zhu <zhsj@debian.org>  Fri, 06 Oct 2023 19:35:37 +0800
  
  golang-1.21 (1.21.1-1) unstable; urgency=medium