Merge version 10.3.0-15+rpi1 and 10.4.0-1 to produce 10.4.0-1+rpi1

diff --cc debian/changelog
index 757e5eea6ccd566def28b8acf426bfea8368a860,a82c6c81c90dc45c3341a3684bcafbc7bfdc13f6..13604540fe7b414df5328f545c27ac6790bfc8e9
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,15 +1,28 @@@
- gcc-10 (10.3.0-15+rpi1) bookworm-staging; urgency=medium
++gcc-10 (10.4.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).
 +
 +  [changes introduced in gcc-9 9.1.0-10+rpi1 by Peter Michael Green]
 +  * Update symbols file for raspbian.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Tue, 29 Mar 2022 17:33:18 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 19 Jul 2022 23:29:59 +0000
++
+ gcc-10 (10.4.0-1) unstable; urgency=medium
+ 
+   * GCC 10.4.0 release.
+   * Refresh patches.
+ 
+  -- Matthias Klose <doko@debian.org>  Wed, 29 Jun 2022 14:30:05 +0200
+ 
+ gcc-10 (10.3.0-16) unstable; urgency=medium
+ 
+   * Update to git 20220622 from the gcc-10 branch (10.4 release candidate).
+ 
+  -- Matthias Klose <doko@debian.org>  Wed, 22 Jun 2022 21:12:42 +0200
  
  gcc-10 (10.3.0-15) unstable; urgency=medium
  

diff --cc debian/rules.patch
Simple merge