From: Raspbian automatic forward porter Date: Sat, 15 Oct 2022 03:00:41 +0000 (+0100) Subject: Merge version 3.0.17.4-5+rpi1 and 3.0.18~rc2-1 to produce 3.0.18~rc2-1+rpi1 X-Git-Tag: archive/raspbian/3.0.18_rc2-1+rpi1~1 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=69df068daf0c371e7858e21111a6722522b608f3;p=vlc.git Merge version 3.0.17.4-5+rpi1 and 3.0.18~rc2-1 to produce 3.0.18~rc2-1+rpi1 --- 69df068daf0c371e7858e21111a6722522b608f3 diff --cc debian/changelog index 8d8af29d,be566698..485c8b0e --- a/debian/changelog +++ b/debian/changelog @@@ -1,10 -1,9 +1,17 @@@ - vlc (3.0.17.4-5+rpi1) bookworm-staging; urgency=medium ++vlc (3.0.18~rc2-1+rpi1) bookworm-staging; urgency=medium + + [changes brought forward from 3.0.11.1-1+rpi1 by Peter Michael Green 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 Mon, 10 Oct 2022 02:23:06 +0000 ++ -- Raspbian forward porter Sat, 15 Oct 2022 03:00:41 +0000 ++ + vlc (3.0.18~rc2-1) unstable; urgency=medium + + * New upstream version 3.0.18~rc2 + * debian/control: Remove patches included upstream + + -- Sebastian Ramacher Mon, 10 Oct 2022 08:44:18 +0200 vlc (3.0.17.4-5) unstable; urgency=medium diff --cc debian/patches/series index 2e16bfe7,9d99b202..1bff042e --- a/debian/patches/series +++ b/debian/patches/series @@@ -1,6 -1,2 +1,3 @@@ 0001-configure-fix-linking-on-RISC-V-ISA.patch 0002-Do-not-generate-cache-during-build.patch - 0003-dav1d-fix-compilation-with-upcoming-dav1d-1.0.patch - 0004-dav1d-limit-the-number-of-extra-frames-needed-by-the.patch - 0005-caca-fix-to-newer-version.patch +add-extern-qualifiers.patch