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

diff --cc debian/changelog
index 7720699f8ad7c3f221aa26c3251aca9aaf606f2a,7a267a275fed85e63da11548f6cfc78f3771be5e..3578fb9aa816ab22ab42969ac3c1e5ec8e2f1869
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,9 +1,17 @@@
- vlc (3.0.20-0+deb11u1+rpi1) bullseye-staging; urgency=medium
++vlc (3.0.21-0+deb11u1+rpi1) bullseye-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 19:48:40 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 11 Jun 2024 19:25:48 +0000
++
+ vlc (3.0.21-0+deb11u1) bullseye-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 23:20:04 +0200
  
  vlc (3.0.20-0+deb11u1) bullseye-security; urgency=medium