Merge tag '1.13.5-1+rpi1' of 172.17.3.10:/build/git/g/golang-1.13 into bullseye-staging

Conflicts:
	debian/changelog

diff --cc debian/changelog
index b31e65206a9231a7ccf43c2aba92fc910e1290a5,a22c7042cfbd05fa80de473b873f11b0233313f6..2e6f8d329f5e462eece5e25e2a2bb43a04b6e680
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,44 -1,14 +1,56 @@@
 -golang-1.13 (1.13.5-1+rpi1) bullseye-staging; urgency=medium
++golang-1.14 (1.14-2+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, 11 Dec 2019 14:44:43 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 15 Mar 2020 07:45:58 +0000
++
 +golang-1.14 (1.14-2) unstable; urgency=medium
 +
 +  * Fix FTBFS if built twice in a row.
 +    Some paths of autogenerated files have been changed upstream,
 +    so that the removal of those files after the build did no
 +    longer succeed.
 +    Thanks to Guillem Jover (Closes: #953277)
 +  * Update Standards-Version to 4.5.0, no changes needed
 +
 + -- Dr. Tobias Quathamer <toddy@debian.org>  Mon, 09 Mar 2020 14:00:39 +0100
 +
 +golang-1.14 (1.14-1) unstable; urgency=medium
 +
 +  * New upstream version 1.14
 +
 + -- Dr. Tobias Quathamer <toddy@debian.org>  Tue, 25 Feb 2020 21:33:50 +0100
 +
 +golang-1.14 (1.14~rc1-1) unstable; urgency=medium
 +
 +  * New upstream version 1.14~rc1
 +    - Fixes CVE-2020-7919
 +  * Add Breaks: dh-golang (<< 1.43~) to golang-go.
 +    Thanks to Pirate Praveen <praveen@onenetbeyond.org>
 +  * Update upstream's signing key
 +  * Add support for riscv64.
 +    Thanks to Aurelien Jarno <aurel32@debian.org> (Closes: #950517)
 +
 + -- Dr. Tobias Quathamer <toddy@debian.org>  Wed, 05 Feb 2020 23:54:28 +0100
 +
 +golang-1.14 (1.14~beta1-2) unstable; urgency=medium
 +
 +  * Source-only upload.
 +  * Add two more lintian overrides for testdata
 +
 + -- Dr. Tobias Quathamer <toddy@debian.org>  Thu, 26 Dec 2019 20:11:44 +0100
 +
 +golang-1.14 (1.14~beta1-1) unstable; urgency=medium
 +
 +  * New upstream major version.
 +
 + -- Dr. Tobias Quathamer <toddy@debian.org>  Wed, 25 Dec 2019 21:27:46 +0100
  
  golang-1.13 (1.13.5-1) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge