Merge version 3.0.16-1+rpi1 and 3.0.17.3-1 to produce 3.0.17.3-1+rpi1

diff --cc debian/changelog
index 65a2854029fe215b7dcf19178b83658f4d2897e0,45673defd1332ef0532ba555d7a6b5228cb9e274..94f77730b18380fadd0459c073e459c2b7f56e9d
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,29 +1,37 @@@
- vlc (3.0.16-1+rpi1) bullseye-staging; urgency=medium
++vlc (3.0.17.3-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>  Fri, 16 Jul 2021 00:46:13 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 17 Mar 2022 20:59:02 +0000
++
+ vlc (3.0.17.3-1) unstable; urgency=medium
+ 
+   * New upstream version 3.0.17.3
+   * debian/
+     - Revert "Disable srt until the package is fixed" (Closes: #983109)
+       Thanks to Florian Ernst
+     - Move srt output plugin to vlc-plugin-access-extra
+ 
+  -- Sebastian Ramacher <sramacher@debian.org>  Sun, 13 Mar 2022 12:41:41 +0100
+ 
+ vlc (3.0.17-1) unstable; urgency=medium
+ 
+   * New upstream version 3.0.17
+     - Fix build with ffmpeg 5.0 (Closes: #1004584)
+   * debian/control:
+     - Switch to libidn-dev
+     - Bump BD on libopenmpt-modplug-dev
+     - Bump Standards-Version
+   * debian/copyright:
+     - Add missing text to BSD-2-clause
+     - Update copyright for 3.0.17
+   * debian/patches: Refresh patches
+   * debian/rules: Set VLC_COMPILE_BY and VLC_COMPILE_HOST (Closes: #990246)
+   * debian/: Update lintian override
+ 
+  -- Sebastian Ramacher <sramacher@debian.org>  Sat, 12 Mar 2022 20:40:54 +0100
  
  vlc (3.0.16-1) unstable; urgency=medium
  

diff --cc debian/patches/series
index 00ff3ab4b1e3a2db8a34f258ae2d2f7223c5bb09,9d99b2026dadf4e59b121e9357aabe8cc95b4cf7..1bff042eb9c83c29531ed458eb339abf86499b53
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -1,4 -1,2 +1,3 @@@
  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
+ 0002-Do-not-generate-cache-during-build.patch
 +add-extern-qualifiers.patch

diff --cc debian/rules
Simple merge