Merge version 0~R99-14469.B-1+rpi1 and 0~R99-14469.B-2 to produce 0~R99-14469.B-2...

diff --cc debian/changelog
index f765e07ec6b0edff04280cdac1727c1e9ea1f181,0a4cfd1b28636d327c62c6f787169c05a7345b82..aecc14a2136acfc5c833e5e91827f5f93b9fdd82
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,8 +1,16 @@@
- vboot-utils (0~R99-14469.B-1+rpi1) bookworm-staging; urgency=medium
++vboot-utils (0~R99-14469.B-2+rpi1) bookworm-staging; urgency=medium
 +
++  [changes brought forward from 0~R99-14469.B-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Tue, 21 Jun 2022 09:42:25 +0000]
 +  * Build with clang 11 to avoid armv7 contamination.
 +  * Disable testsuite.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Tue, 21 Jun 2022 09:42:25 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 06 Aug 2022 23:28:21 +0000
++
+ vboot-utils (0~R99-14469.B-2) unstable; urgency=medium
+ 
+   * Fix switch to llvm-toolchain-13: use libfuzzer-13-dev (Closes: #1000916)
+ 
+  -- Sophie Brun <sophie@offensive-security.com>  Mon, 18 Jul 2022 11:08:11 +0200
  
  vboot-utils (0~R99-14469.B-1) unstable; urgency=medium
  

diff --cc debian/control
index 2f6720541c29e80a825b766ea7a71847fb651360,6758cd3fbb55336b47c4801bc4c3de46b5e1338c..9cebc223d694b76abceea3301df0416b0840a923
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -4,9 -4,9 +4,9 @@@ Priority: optiona
  Maintainer: Sophie Brun <sophie@offensive-security.com>
  Uploaders: Raphaël Hertzog <raphael@offensive-security.com>
  Build-Depends: debhelper-compat (= 13),
 -               clang-13,
 +               clang-11,
               libflashrom-dev,
-                libfuzzer-11-dev,
+                libfuzzer-13-dev,
                 liblzma-dev,
                 libssl-dev,
                 libyaml-dev,