From: Raspbian automatic forward porter <root@raspbian.org>
Date: Wed, 12 Mar 2025 03:03:22 +0000 (+0000)
Subject: Merge version 3.0.21-7+rpi1 and 3.0.21-9 to produce 3.0.21-9+rpi1
X-Git-Tag: archive/raspbian/3.0.21-9+rpi1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c49e5d5cee60db9de45ecfacdbd52a6e183504cc;p=vlc.git

Merge version 3.0.21-7+rpi1 and 3.0.21-9 to produce 3.0.21-9+rpi1
---

a738a87adfc51b12cffe4d4a3f1b7dcadb9314bf
diff --cc debian/changelog
index 3a8c9c4f,69d31322..3731d218
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,17 +1,25 @@@
- vlc (3.0.21-7+rpi1) trixie-staging; urgency=medium
++vlc (3.0.21-9+rpi1) trixie-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>  Thu, 30 Jan 2025 16:42:09 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 12 Mar 2025 03:03:22 +0000
++
+ vlc (3.0.21-9) unstable; urgency=medium
+ 
+   * Revert "Bump to lua5.4"
+     The vlc script ecosystem expects certain versions of lua and lua5.4 is not
+     one of them.
+ 
+  -- Sebastian Ramacher <sramacher@debian.org>  Fri, 07 Mar 2025 07:31:22 +0100
+ 
+ vlc (3.0.21-8) unstable; urgency=medium
+ 
+   * Team upload
+   * Bump to lua5.4
+ 
+  -- Bastian Germann <bage@debian.org>  Fri, 07 Mar 2025 01:01:48 +0100
  
  vlc (3.0.21-7) unstable; urgency=medium