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

diff --cc debian/changelog
index d9f8b6d2d826be38fb9841e4851f2aa549d23cc1,3e3bf444b45d7cce7292863bcb86df6535bbc7cb..3a8c9c4f5203fe498e6e0f6cbedd92a1c2d4b281
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,55 +1,63 @@@
- vlc (3.0.21-2+rpi1) trixie-staging; urgency=medium
++vlc (3.0.21-7+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>  Thu, 30 Jan 2025 16:42:09 +0000
++
+ vlc (3.0.21-7) unstable; urgency=medium
+ 
+   * debian/patches: Fix build with x265 4.1
+ 
+  -- Sebastian Ramacher <sramacher@debian.org>  Tue, 21 Jan 2025 19:02:47 +0100
+ 
+ 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
  

diff --cc debian/rules
Simple merge