From: Raspbian automatic forward porter <root@raspbian.org>
Date: Wed, 21 Aug 2024 04:45:06 +0000 (+0100)
Subject: Merge version 3.0.21-1+rpi1 and 3.0.21-2 to produce 3.0.21-2+rpi1
X-Git-Tag: archive/raspbian/3.0.21-2+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=fcbf2d10c5cc3ada740bc3e02e2ee7c6c9c7c296;p=vlc.git

Merge version 3.0.21-1+rpi1 and 3.0.21-2 to produce 3.0.21-2+rpi1
---

fcbf2d10c5cc3ada740bc3e02e2ee7c6c9c7c296
diff --cc debian/changelog
index dca6910d,8d93bdb2..d9f8b6d2
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,9 +1,17 @@@
- vlc (3.0.21-1+rpi1) trixie-staging; urgency=medium
++vlc (3.0.21-2+rpi1) trixie-staging; urgency=medium
 +
 +  [changes brought forward from 3.0.11.1-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 30 Aug 2020 00:37:35 +0000]
 +  * Add extern to three functions for gcc-10 compatibility.
 +  * Partially fix clean target.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Wed, 12 Jun 2024 14:31:11 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 21 Aug 2024 04:45:06 +0000
++
+ vlc (3.0.21-2) unstable; urgency=medium
+ 
+   * debian/patches: Apply WIP patches for ffmpeg 7.0 support (Closes:
+     #1072456)
+ 
+  -- Sebastian Ramacher <sramacher@debian.org>  Thu, 15 Aug 2024 12:11:01 +0200
  
  vlc (3.0.21-1) unstable; urgency=medium