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

diff --cc debian/changelog
index c38a083a93e5a0983b6f13df8ca80c8db5a1ec62,89a9f3bf6719e38a4a49ede0d3624d68a50283fc..0aea1fa338de6f90eb802e825beb52f55496e599
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,8 +1,15 @@@
- gcc-12-cross (11+rpi1) bookworm-staging; urgency=medium
++gcc-12-cross (12+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.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 22 Sep 2022 18:53:10 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 27 Sep 2022 10:24:01 +0000
++
+ gcc-12-cross (12) unstable; urgency=medium
+ 
+   * Build using gcc 12.2.0-3.
+ 
+  -- Matthias Klose <doko@debian.org>  Wed, 21 Sep 2022 17:13:33 +0200
  
  gcc-12-cross (11) unstable; urgency=medium
  

diff --cc debian/control
Simple merge

diff --cc debian/rules
Simple merge