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

diff --cc debian/changelog
index 485c8b0efd81544d57b959129d28fa9ecd573bd4,f4da65c2cf57a0a2b1dbcf2c8de5762c0a7d601a..3eafb3aaa1d69982cd970ceda7444bea53a2b759
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,8 +1,16 @@@
- vlc (3.0.18~rc2-1+rpi1) bookworm-staging; urgency=medium
++vlc (3.0.18-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>  Sat, 15 Oct 2022 03:00:41 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 29 Nov 2022 13:06:55 +0000
++
+ vlc (3.0.18-1) unstable; urgency=medium
+ 
+   * New upstream version 3.0.18
+ 
+  -- Mateusz Łukasik <mati75@linuxmint.pl>  Wed, 23 Nov 2022 19:50:35 +0100
  
  vlc (3.0.18~rc2-1) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge