From: Raspbian automatic forward porter <root@raspbian.org>
Date: Fri, 24 Jan 2025 07:21:28 +0000 (+0000)
Subject: Merge version 3.0.21-2+rpi1 and 3.0.21-6 to produce 3.0.21-6+rpi1
X-Git-Tag: archive/raspbian/3.0.21-6+rpi1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=44338bd133b7d93be9e6fce9b747aa946da9a3bc;p=vlc.git

Merge version 3.0.21-2+rpi1 and 3.0.21-6 to produce 3.0.21-6+rpi1
---

f0978ee7899f61c6a22a40c013051b88e57d6895
diff --cc debian/changelog
index d9f8b6d2,8ddab57a..b24e403f
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,49 +1,57 @@@
- vlc (3.0.21-2+rpi1) trixie-staging; urgency=medium
++vlc (3.0.21-6+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>  Wed, 21 Aug 2024 04:45:06 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 24 Jan 2025 07:21:28 +0000
++
+ vlc (3.0.21-6) unstable; urgency=medium
+ 
+   * debian/patches: Update to 3.0.21-1-385-g7b58309ae7
+     * Ignore win32 and compat changes
+     * Replace taglib 2.x patches with upstream changes
+   * debian/: Re-enable VAAPI support (Closes: #1021601, #1013898)
+ 
+  -- Sebastian Ramacher <sramacher@debian.org>  Tue, 14 Jan 2025 23:09:47 +0100
+ 
+ vlc (3.0.21-5) unstable; urgency=medium
+ 
+   * Fix changelog of 3.0.21-3
+   * debian/patches: Split patches into upstream and Arch patch
+ 
+  -- Sebastian Ramacher <sramacher@debian.org>  Sat, 11 Jan 2025 10:55:36 +0100
+ 
+ vlc (3.0.21-4) unstable; urgency=medium
+ 
+   * Team upload.
+   * Upload to unstable.
+   * debian/patches/0014-Taglib-1.x-and-2.x-compat-fix.patch:
+     Update patch to fix FTBFS on ARM architectures.
+   * debian/control: Update build-dependency package name:
+     + libtag1-dev => libtag-dev.
+ 
+  -- Boyuan Yang <byang@debian.org>  Fri, 10 Jan 2025 22:33:36 -0500
+ 
+ vlc (3.0.21-4~exp1) experimental; urgency=medium
+ 
+   * Team upload.
+   * Force rebuild with taglib 2.x.
+ 
+  -- Boyuan Yang <byang@debian.org>  Fri, 10 Jan 2025 11:21:32 -0500
+ 
+ vlc (3.0.21-3) unstable; urgency=medium
+ 
+   * Team upload.
+ 
+   [ Sebastian Ramacher ]
+   * debian/clean: Clean luac files (Closes: #1047601)
+ 
+   [ Boyuan Yang ]
+   * debian/patches/0014-Taglib-1.x-and-2.x-compat-fix.patch:
+     Add patch to fix compatibility with both Taglib 1.x and 2.x.
+ 
+  -- Boyuan Yang <byang@debian.org>  Fri, 10 Jan 2025 11:06:11 -0500
  
  vlc (3.0.21-2) unstable; urgency=medium