Merge version 12+rpi1 and 13 to produce 13+rpi1

diff --cc debian/changelog
index 95f1866a3d26a31259ccd2c87d0b7b56c06db0e5,09339f188b84503697b1f05d9b0c8ae189caf0a0..7ca48cd7c28e8e026107add47a77119686c57022
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,8 +1,15 @@@
- gcc-11-cross (12+rpi1) bookworm-staging; urgency=medium
++gcc-11-cross (13+rpi1) bookworm-staging; urgency=medium
 +
 +  [changes brought forward from gcc-10-cross 11+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 24 Sep 2020 23:26:27 +0000]
 +  * Build sufficient cross-compilers on armhf to build u-boot.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Thu, 07 Apr 2022 17:47:10 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 11 May 2022 13:08:04 +0000
++
+ gcc-11-cross (13) unstable; urgency=medium
+ 
+   * Build using gcc 11.3.0-1.
+ 
+  -- Matthias Klose <doko@debian.org>  Mon, 02 May 2022 18:56:57 +0200
  
  gcc-11-cross (12) unstable; urgency=medium
  

diff --cc debian/control
Simple merge

diff --cc debian/rules
Simple merge