Merge version 1:11.8.1-2+rpi1 and 1:11.8.1-4 to produce 1:11.8.1-4+rpi1

diff --cc debian/changelog
index 84cedfcec1e8560abb99b500c1f055418047c9e6,22c690b155bdd402432c39469a0fb224ffc84766..99f3ffc8b4a61b23028273ef4f23fe649b6e77e3
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,26 +1,33 @@@
- mariadb (1:11.8.1-2+rpi1) trixie-staging; urgency=medium
++mariadb (1:11.8.1-4+rpi1) trixie-staging; urgency=medium
 +
 +  [changes brought forward from 1:10.11.3-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Tue, 06 Jun 2023 14:09:17 +0000]
 +  * Disable testsuite.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sun, 30 Mar 2025 12:14:21 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 07 May 2025 20:45:33 +0000
++
+ mariadb (1:11.8.1-4) unstable; urgency=medium
+ 
+   * Disable main.mysqld--help-aria test that failed on nearly every
+     architecture in previous upload due to new upstream issue (MDEV-36334)
+   * Disable some vector related tests that failed on sparc64 (MDEV-36670)
+   * Backport main.func_format fix for exabyte/petabyte mismatch on i386
+ 
+  -- Otto Kekäläinen <otto@debian.org>  Wed, 23 Apr 2025 07:29:38 -0700
+ 
+ mariadb (1:11.8.1-3) unstable; urgency=medium
+ 
+   * Add patch to have CEST as allowed in main.timezone test (Closes: #1084293)
+   * Backport revert of CONC-710 that broke building UDFs (Closes: #1101397)
+   * Backport systemd service fix for restarts on crashes (Closes: #1073847)
+   * Update standards version to 4.7.2, no changes needed
+   * Re-enable tests that were passing recently in experimental when MariaDB
+     Debian revision 1:11.4.5-2~exp1 built or which otherwise was confirmed to
+     passing now: mariabackup.encrypted_page_corruption, mariadb_upgrade,
+     MDEV-22243, MDEV-23427, MDEV-23921, MDEV-27955, MDEV-30518, MDEV-30676,
+     MDEV-30728, MDEV-30918, MDEV-30929, MDEV-31349, MDEV-33520, MDEV-33520,
+     MDEV-34084, MDEV-34733, MDEV-34781, MDEV-34788, MDEV-36334
+ 
+  -- Otto Kekäläinen <otto@debian.org>  Sat, 19 Apr 2025 12:06:11 -0700
  
  mariadb (1:11.8.1-2) unstable; urgency=medium