From: Raspbian automatic forward porter <root@raspbian.org>
Date: Sat, 6 Aug 2022 23:28:21 +0000 (+0100)
Subject: Merge version 0~R99-14469.B-1+rpi1 and 0~R99-14469.B-2 to produce 0~R99-14469.B-2... 
X-Git-Tag: archive/raspbian/0_R99-14469.B-2+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=3b0ab2a636ae9813697eb8e326106f69d67c791b;p=vboot-utils.git

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

3b0ab2a636ae9813697eb8e326106f69d67c791b
diff --cc debian/changelog
index f765e07,0a4cfd1..aecc14a
--- a/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 2f67205,6758cd3..9cebc22
--- a/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,