Merge version 7+rpi1 and 10 to produce 10+rpi1

diff --cc debian/changelog
index 35c2e10127e1537fdcd5c9eabf6642c4e123617b,b4cb5f6331d19ba99cf9894fb7d23323aefc818d..18bde503769ff515852e0927ae99309bad545f93
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,14 +1,21 @@@
- gcc-12-cross (7+rpi1) bookworm-staging; urgency=medium
++gcc-12-cross (10+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>  Tue, 09 Aug 2022 19:32:17 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 15 Sep 2022 02:01:41 +0000
++
+ gcc-12-cross (10) unstable; urgency=medium
+ 
+   * Build using gcc 12.2.0-1.
+ 
+  -- Matthias Klose <doko@debian.org>  Tue, 23 Aug 2022 11:51:36 +0200
+ 
+ gcc-12-cross (9) unstable; urgency=medium
+ 
+   * Build using gcc 12.1.0-8.
+ 
+  -- Matthias Klose <doko@debian.org>  Mon, 15 Aug 2022 17:10:38 +0200
  
  gcc-12-cross (7) unstable; urgency=medium
  

diff --cc debian/control
Simple merge

diff --cc debian/rules
Simple merge