Merge version 3.0.11.1-1+rpi1 and 3.0.11.1-2 to produce 3.0.11.1-2+rpi1

diff --cc debian/changelog
index 720bf9d94e26b09a1d60629016404d8cdb8569b5,03b15dcf6cb1d24aecd408b0e719e5fab4b9c0ab..2a13ba74f1c9baf470fb9c86bca6b48e695adbe5
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,11 +1,19 @@@
- vlc (3.0.11.1-1+rpi1) bullseye-staging; urgency=medium
++vlc (3.0.11.1-2+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.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Sun, 30 Aug 2020 00:37:35 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 28 Sep 2020 07:56:21 +0000
++
+ vlc (3.0.11.1-2) unstable; urgency=medium
+ 
+   * debian/control:
+     - Remove unsed B-D
+     - Switch to libdc1394-dev
+     - Add Suggests and Recommends on the remaining packages (Closes: #970596)
+ 
+  -- Sebastian Ramacher <sramacher@debian.org>  Tue, 22 Sep 2020 23:11:26 +0200
  
  vlc (3.0.11.1-1) unstable; urgency=medium