From: Raspbian automatic forward porter <root@raspbian.org>
Date: Fri, 5 Feb 2021 06:02:21 +0000 (+0000)
Subject: Merge version 3.0.12-1+rpi1 and 3.0.12-2 to produce 3.0.12-2+rpi1
X-Git-Tag: archive/raspbian/3.0.12-2+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=bf3adf9835f3ba06ffb948a7b3b3518f49cbcd5a;p=vlc.git

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

bf3adf9835f3ba06ffb948a7b3b3518f49cbcd5a
diff --cc debian/changelog
index 63f9c16e,e3a89d8f..63f83cb8
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,8 +1,16 @@@
- vlc (3.0.12-1+rpi1) bullseye-staging; urgency=medium
++vlc (3.0.12-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.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Mon, 25 Jan 2021 00:51:06 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 05 Feb 2021 06:02:20 +0000
++
+ vlc (3.0.12-2) unstable; urgency=medium
+ 
+   * debian/: Disable live555 plugin due to ä981439
+ 
+  -- Sebastian Ramacher <sramacher@debian.org>  Sun, 31 Jan 2021 11:40:59 +0100
  
  vlc (3.0.12-1) unstable; urgency=medium