Merge version 3.0.18-2+rpi1 and 3.0.20-0+deb12u1 to produce 3.0.20-0+deb12u1+rpi1

diff --cc debian/changelog
index 0958d55a4b246e92e53f7d77a898c39b8fa5c9b7,66af8a7f7d18d429381bf145b14fd30fb9de9997..aa1990b207e3a8d0a8de9245f05e607faa4b4fa3
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,12 +1,20 @@@
- vlc (3.0.18-2+rpi1) bookworm-staging; urgency=medium
++vlc (3.0.20-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, 08 Dec 2022 20:15:04 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 09 Nov 2023 21:03:58 +0000
++
+ vlc (3.0.20-0+deb12u1) bookworm-security; urgency=medium
+ 
+   * New upstream version 3.0.20
+     - Improve muxing timestamps in a few formats (Closes: #1054528)
+     - Fix potential security issue (OOB Write) on MMS://
+   * debian/gbp.conf: Work in bookworm branch
+   * debian/patches: Drop patches included upstream
+ 
+  -- Sebastian Ramacher <sramacher@debian.org>  Sun, 29 Oct 2023 21:14:38 +0100
  
  vlc (3.0.18-2) unstable; urgency=medium