Merge version 0.0~git20220118.0725d78-1+rpi1 and 0.0~git20220314.bd99dbf-1 to produce...

diff --cc debian/changelog
index caee5267ecd7f6c4c9e7b93d40312c1b349e63a8,4944778ef7bc1228900dfa5481d9182cd0154951..64f0365966fe7026129b1a2727ef5bbec9121b33
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,8 +1,15 @@@
- generate-ninja (0.0~git20220118.0725d78-1+rpi1) bookworm-staging; urgency=medium
++generate-ninja (0.0~git20220314.bd99dbf-1+rpi1) bookworm-staging; urgency=medium
 +
++  [changes brought forward from 0.0~git20220118.0725d78-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 19 Mar 2022 18:29:19 +0000]
 +  * Build with clang 11 to avoid armv7 contamination.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Sat, 19 Mar 2022 18:29:19 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 25 Mar 2022 03:43:48 +0000
++
+ generate-ninja (0.0~git20220314.bd99dbf-1) unstable; urgency=medium
+ 
+   * Revup upstream.
+ 
+  -- Ricardo Ribalda Delgado <ricardo@ribalda.com>  Mon, 21 Mar 2022 07:51:44 +0100
  
  generate-ninja (0.0~git20220118.0725d78-1) unstable; urgency=medium