From: Raspbian automatic forward porter <root@raspbian.org>
Date: Sun, 26 May 2024 11:49:51 +0000 (+0100)
Subject: Merge version 1.0.0-2+rpi1 and 1.0.0-2+deb12u1 to produce 1.0.0-2+rpi1+deb12u1
X-Git-Tag: archive/raspbian/1.0.0-2+rpi1+deb12u1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=4fd4d9078eec984f8315774f8d683c68cfc80485;p=dav1d.git

Merge version 1.0.0-2+rpi1 and 1.0.0-2+deb12u1 to produce 1.0.0-2+rpi1+deb12u1
---

4fd4d9078eec984f8315774f8d683c68cfc80485
diff --cc debian/changelog
index 67b647e,194226a..e384020
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,8 +1,16 @@@
- dav1d (1.0.0-2+rpi1) bookworm-staging; urgency=medium
++dav1d (1.0.0-2+rpi1+deb12u1) bookworm-staging; urgency=medium
 +
 +  [changes brought forward from 0.7.1-3+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 12 Jul 2020 23:43:27 +0000]
 +  * Disable asm, it seems to cause the resulting binary to come out
 +    armv7 contaminated.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sat, 28 May 2022 19:14:12 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 26 May 2024 11:49:51 +0000
++
+ dav1d (1.0.0-2+deb12u1) bookworm-security; urgency=medium
+ 
+   * CVE-2024-1580 (Closes: #1064310)
+ 
+  -- Moritz Mühlenhoff <jmm@debian.org>  Thu, 25 Apr 2024 19:31:24 +0200
  
  dav1d (1.0.0-2) unstable; urgency=medium