Merge version 3.0.17.4-5+rpi1 and 3.0.18~rc2-1 to produce 3.0.18~rc2-1+rpi1

diff --cc debian/changelog
index 8d8af29d060864d79ee8b04661cded4082ee04c1,be566698e5ad6f01b9df1e9f3408fa5789198d68..485c8b0efd81544d57b959129d28fa9ecd573bd4
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,9 +1,17 @@@
- vlc (3.0.17.4-5+rpi1) bookworm-staging; urgency=medium
++vlc (3.0.18~rc2-1+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>  Mon, 10 Oct 2022 02:23:06 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 15 Oct 2022 03:00:41 +0000
++
+ vlc (3.0.18~rc2-1) unstable; urgency=medium
+ 
+   * New upstream version 3.0.18~rc2
+   * debian/control: Remove patches included upstream
+ 
+  -- Sebastian Ramacher <sramacher@debian.org>  Mon, 10 Oct 2022 08:44:18 +0200
  
  vlc (3.0.17.4-5) unstable; urgency=medium
  

diff --cc debian/patches/series
index 2e16bfe7f95fa820132488178251caecdd64863a,9d99b2026dadf4e59b121e9357aabe8cc95b4cf7..1bff042eb9c83c29531ed458eb339abf86499b53
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -1,6 -1,2 +1,3 @@@
  0001-configure-fix-linking-on-RISC-V-ISA.patch
  0002-Do-not-generate-cache-during-build.patch
- 0003-dav1d-fix-compilation-with-upcoming-dav1d-1.0.patch
- 0004-dav1d-limit-the-number-of-extra-frames-needed-by-the.patch
- 0005-caca-fix-to-newer-version.patch
 +add-extern-qualifiers.patch