Merge version 12-20220428-1+rpi1 and 12.1.0-1 to produce 12.1.0-1+rpi1

diff --cc debian/changelog
index a96700d4f1155b94fb152524a0b2a6ef2122963d,3606d0085b90d0f93425da5c49956e46a95c9228..485217aa85a5c0475ff99962592700148bf968c5
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,9 +1,19 @@@
- gcc-12 (12-20220428-1+rpi1) bookworm-staging; urgency=medium
++gcc-12 (12.1.0-1+rpi1) bookworm-staging; urgency=medium
 +
 +  [changes brought forward from gcc-8 8-20180207-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 17 Feb 2018 00:20:23 +0000]
 +  * Don't pass -march=armv7+fp to compiler when building libatomic.
 +
 +  [changes introduced in gcc-8 8.2.0-16+rpi1 by Peter Michael Green]
 +  * Disable testsuite (build seems to hang after testsuite completes).
 +
-  -- Raspbian forward porter <root@raspbian.org>  Fri, 06 May 2022 18:27:23 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 12 May 2022 15:23:04 +0000
++
+ gcc-12 (12.1.0-1) unstable; urgency=medium
+ 
+   * GCC 12.1.0 release.
+   * Refresh patches.
+ 
+  -- Matthias Klose <doko@debian.org>  Sun, 08 May 2022 15:44:36 +0200
  
  gcc-12 (12-20220428-1) unstable; urgency=medium
  

diff --cc debian/rules.patch
Simple merge