Merge version 3.0.12-3+rpi1 and 3.0.16-1 to produce 3.0.16-1+rpi1

diff --cc debian/changelog
index ceb0a3306b0c5e7ea8b1fae78aa94b326307755e,8f738780c527801b4d4df326d3a07a81317f0915..65a2854029fe215b7dcf19178b83658f4d2897e0
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,19 +1,27 @@@
- vlc (3.0.12-3+rpi1) bullseye-staging; urgency=medium
++vlc (3.0.16-1+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>  Tue, 16 Mar 2021 16:39:48 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 16 Jul 2021 00:46:13 +0000
++
+ vlc (3.0.16-1) unstable; urgency=medium
+ 
+   * Upload to unstable
+   * New upstream release
+ 
+  -- Sebastian Ramacher <sramacher@debian.org>  Mon, 21 Jun 2021 21:07:16 +0200
+ 
+ vlc (3.0.15-1) experimental; urgency=medium
+ 
+   [ Mateusz Łukasik ]
+   * New upstream release
+     - Fix remote code execution through crafted playlist
+       (VideoLAN-SB-VLC-3013)
+   * Remove patches included upstream.
+ 
+  -- Sebastian Ramacher <sramacher@debian.org>  Thu, 17 Jun 2021 23:38:35 +0200
  
  vlc (3.0.12-3) unstable; urgency=medium
  

diff --cc debian/patches/series
index 3de03fe821431245e582467501f378869b31de5d,4ac56b9c173988f5992eefc6bd9d3702a365dda5..00ff3ab4b1e3a2db8a34f258ae2d2f7223c5bb09
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -1,7 -1,3 +1,4 @@@
  0001-configure-fix-linking-on-RISC-V-ISA.patch
  0002-Revert-configure-Require-libmodplug-0.8.9.patch
  0003-Do-not-generate-cache-during-build.patch
- 0004-qt-add-a-private-structure-for-window-provider.patch
- 0005-qt-create-another-indirection-X11-window.patch
- 0006-qt-reparent-video-window-to-root-whence-UI-closes.patch
 +add-extern-qualifiers.patch