Merge version 0.0~git20220314.bd99dbf-1+rpi1 and 0.0~git20220811.0bcd37b-1 to produce...

diff --cc debian/changelog
index 64f0365966fe7026129b1a2727ef5bbec9121b33,a5fe380a4dd797eb3625f5fd6a3d830a29bec5d8..803580a26c6ee0da52962b7a6bbe1619fcd09bd6
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,10 +1,17 @@@
- generate-ninja (0.0~git20220314.bd99dbf-1+rpi1) bookworm-staging; urgency=medium
++generate-ninja (0.0~git20220811.0bcd37b-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.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Fri, 25 Mar 2022 03:43:48 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 28 Aug 2022 23:01:35 +0000
++
+ generate-ninja (0.0~git20220811.0bcd37b-1) unstable; urgency=medium
+ 
+   * Update Unbundling-version.git patch.
+   * Disable dwz (Closes: #1016330).
+   * Revup upstream.
+ 
+  -- Ricardo Ribalda Delgado <ricardo@ribalda.com>  Mon, 15 Aug 2022 09:56:34 +0200
  
  generate-ninja (0.0~git20220314.bd99dbf-1) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge