Merge changes from golang-1.17 '1.12.7-3+rpi1' into golang-1.18 packaging.

diff --cc debian/changelog
index fe6554231feea56cd0d909b50283c0480f49f00a,b7a93f28a3905099055cf2623f40b5d271a52ac0..78c4e29ece3839b641d16d8cd5b080b84c553653
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,41 -1,23 +1,53 @@@
 -golang-1.12 (1.12.7-3+rpi1) bullseye-staging; urgency=medium
++golang-1.13 (1.13.1-1+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.
+ 
 - -- Peter Michael Green <plugwash@raspbian.org>  Fri, 16 Aug 2019 20:02:16 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Tue, 22 Oct 2019 20:30:26 +0000
+ 
 -golang-1.12 (1.12.7-3) unstable; urgency=medium
 +golang-1.13 (1.13.1-1) unstable; urgency=medium
  
 -  * Set GOCACHE to fix a FTBFS. (Closes: #933958)
 +  * New upstream version 1.13.1
 +    - net/textproto: don't normalize headers with spaces before the colon.
 +      Fixes CVE-2019-16276. See https://github.com/golang/go/issues/34541
 +      and Debian bug #941173
  
 - -- Dr. Tobias Quathamer <toddy@debian.org>  Mon, 05 Aug 2019 21:49:35 +0200
 + -- Dr. Tobias Quathamer <toddy@debian.org>  Thu, 26 Sep 2019 11:32:14 +0200
  
 -golang-1.12 (1.12.7-2) unstable; urgency=medium
 +golang-1.13 (1.13-1) unstable; urgency=medium
  
 +  * New upstream version 1.13
 +    - Refresh patch
 +  * Set pristine-tar for gbp to False
 +
 + -- Dr. Tobias Quathamer <toddy@debian.org>  Wed, 04 Sep 2019 11:28:07 +0200
 +
 +golang-1.13 (1.13~rc2-1) unstable; urgency=medium
 +
 +  * New upstream version 1.13~rc2
 +    - Remove patch for CVE-2019-9512 and CVE-2019-9514,
 +      has been applied upstream
 +
 + -- Dr. Tobias Quathamer <toddy@debian.org>  Fri, 30 Aug 2019 13:29:21 +0200
 +
 +golang-1.13 (1.13~rc1-2) unstable; urgency=medium
 +
 +  * Exclude testdata from dh_makeshlibs.
 +    Otherwise, the build fails at least on armel and armhf.
 +  * Apply changes from cme fix dpkg
 +  * Set Rules-Requires-Root: no
 +
 + -- Dr. Tobias Quathamer <toddy@debian.org>  Thu, 22 Aug 2019 15:21:10 +0200
 +
 +golang-1.13 (1.13~rc1-1) unstable; urgency=medium
 +
 +  * New upstream version 1.13~rc1
 +    - Remove patch for CVE-2019-14809, has been applied upstream
    * Use dh_missing instead of deprecated dh_install --fail-missing
    * Do not run dh_dwz, there is no debugging information
    * Use debhelper-compat (= 12)

diff --cc debian/rules
Simple merge