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

diff --cc debian/changelog
index 2a089c73d6ace919ae377e212a1955d01b6553f2,1f43888274a733a25e7740d37baabff06dcec82b..dca6910d876c587c33974677b53c83ae3956e2d2
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,36 +1,44 @@@
- vlc (3.0.20-1+rpi1) trixie-staging; urgency=medium
++vlc (3.0.21-1+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>  Fri, 10 Nov 2023 23:42:32 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 12 Jun 2024 14:31:11 +0000
++
+ vlc (3.0.21-1) unstable; urgency=medium
+ 
+   * New upstream version 3.0.21
+   * debian/patches: Refresh patches
+   * debian/control: Replace obsolete packages with their new versions
+ 
+  -- Sebastian Ramacher <sramacher@debian.org>  Sun, 09 Jun 2024 18:01:08 +0200
+ 
+ vlc (3.0.20-4) unstable; urgency=medium
+ 
+   [ Bastian Germann ]
+   * Drop OMX support (see #1065623)
+   * Drop kFreeBSD support
+ 
+   [ Sebastian Ramacher ]
+   * debian/:
+     - Complete omxil removal
+     - Complete kfreebsd support removal
+   * debian/control: Bump Standards-Version
+ 
+  -- Sebastian Ramacher <sramacher@debian.org>  Thu, 11 Apr 2024 22:16:25 +0200
+ 
+ vlc (3.0.20-3) unstable; urgency=medium
+ 
+   * debian/control: Add missing dpkg-dev BD for time_t
+ 
+  -- Sebastian Ramacher <sramacher@debian.org>  Sat, 02 Mar 2024 10:55:19 +0100
+ 
+ vlc (3.0.20-2) unstable; urgency=medium
+ 
+   * debian/patches: Bump module ABI for time_t transition
+ 
+  -- Sebastian Ramacher <sramacher@debian.org>  Wed, 28 Feb 2024 23:55:54 +0100
  
  vlc (3.0.20-1) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge