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

diff --cc debian/changelog
index 99f3ffc8b4a61b23028273ef4f23fe649b6e77e3,8b2c2c816530b0f163d82212f5ce68d74df0ac14..da01a3cd4dc91af3725ab4af7f358681f17e26b3
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,52 +1,59 @@@
- mariadb (1:11.8.1-4+rpi1) trixie-staging; urgency=medium
++mariadb (1:11.8.2-1+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>  Wed, 07 May 2025 20:45:33 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 01 Aug 2025 13:43:39 +0000
++
+ mariadb (1:11.8.2-1) unstable; urgency=medium
+ 
+   * New upstream version 11.8.2, which also announces the 11.8 series now
+     ready for general availability (GA) with security releases for 5 years.
+     This release includes fixes for several defects as noted at
+     https://mariadb.com/kb/en/mariadb-11-8-2-release-notes/ as well
+     the following security issues (Closes: #1100437, #1105976):
+     - CVE-2023-52969
+     - CVE-2023-52970
+     - CVE-2023-52971
+     - CVE-2025-30693
+     - CVE-2025-30722
+   * Drop all RocksDB patches now upstream due to update to version 6.29fb
+   * Drop PCRE2 10.45 compatibility patch obsoleted by upstream test change
+   * Update configuration traces to include new upstream system variables:
+     - innodb-buffer-pool-size-auto-min (default: 0)
+     - innodb-buffer-pool-size-max (default: 0)
+     - innodb-log-checkpoint-now (default: FALSE)
+   * Also update configuration traces to match that in 11.8.2 the variables
+     innodb-buffer-pool-chunk-size and innodb-log-spin-wait-delay are advertised
+     as deprecated.
+   * Disable new unreliable test main.mysql-interactive
+   * Add Breaks/Replaces for files moved around in src:mysql-8.4 (LP: #2110378)
+   * Update mariadb-server.NEWS with information about MariaDB 11.8 and
+   * best practices for creating app user and allowing remote connections
+   * Add patch to improve output from mariadb-secure-installation
+ 
+  -- Otto Kekäläinen <otto@debian.org>  Sun, 08 Jun 2025 11:19:07 +0300
+ 
+ mariadb (1:11.8.1-5) unstable; urgency=medium
+ 
+   [ Otto Kekäläinen ]
+   * Disable additional tests that failed on sparc64 (MDEV-36670)
+   * Have all server plugins depend on mariadb-server-core (Closes: #1039702)
+   * Make plugin dependencies on mariadbd on strictly versioned
+     (Closes: #1057708)
+   * Remove redundant BSD license comment in debian/copyright
+   * Remove unnecessary arch from dh_installinit rule
+   * Make COMPILATION_COMMENT and MYSQL_SERVER_SUFFIX more useful
+   * Several improvements to Salsa CI, Lintian overrides and other quality
+     assurance for Debian 13 "Trixie"
+ 
+   [ Jing Luo ]
+   * d/upstream/metadata: change github url protocol from git to https
+   * d/copyright: remove old FSF address
+   * d/copyright: move "On Debian systems..." to comment stanza
+   * d/copyright: misc fixes, remove the full text of BSD-3 and Artistic
+ 
+  -- Otto Kekäläinen <otto@debian.org>  Mon, 26 May 2025 09:23:46 -0700
  
  mariadb (1:11.8.1-4) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge