Merge version 3.0.20-0+deb12u1+rpi1 and 3.0.21-0+deb12u1 to produce 3.0.21-0+deb12u1...

diff --cc debian/changelog
index aa1990b207e3a8d0a8de9245f05e607faa4b4fa3,1f650de77aa0e5e80887267bf8f02f629542793e..c32be211ea513878d12937e7c92813457efcd4ec
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,9 +1,17 @@@
- vlc (3.0.20-0+deb12u1+rpi1) bookworm-staging; urgency=medium
++vlc (3.0.21-0+deb12u1+rpi1) bookworm-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>  Thu, 09 Nov 2023 21:03:58 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 11 Jun 2024 23:25:30 +0000
++
+ vlc (3.0.21-0+deb12u1) bookworm-security; urgency=medium
+ 
+   * New upstream version 3.0.21
+     - Fix security integer overflow in MMS module
+ 
+  -- Sebastian Ramacher <sramacher@debian.org>  Mon, 10 Jun 2024 22:58:19 +0200
  
  vlc (3.0.20-0+deb12u1) bookworm-security; urgency=medium