Merge version 1:10.11.8-1+rpi1 and 1:11.4.2-4 to produce 1:11.4.2-4+rpi1

diff --cc debian/changelog
index 021b93f4eb32af7f7956aeefd2c6f5b479f57369,0275960148f8db33c8b1ab78747f88120e988b0c..713dcc70f808e006e7a61cba385898e8f1bcfd2d
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,46 +1,53 @@@
- mariadb (1:10.11.8-1+rpi1) trixie-staging; urgency=medium
++mariadb (1:11.4.2-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>  Wed, 05 Jun 2024 01:33:53 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 27 Jul 2024 08:08:51 +0000
++
+ mariadb (1:11.4.2-4) unstable; urgency=medium
+ 
+   * Revert move of 'mysqld_safe' to compat package to avoid breaking pdns
+ 
+  -- Otto Kekäläinen <otto@debian.org>  Fri, 12 Jul 2024 20:52:32 -0700
+ 
+ mariadb (1:11.4.2-3) unstable; urgency=medium
+ 
+   * Make compile_time_assert compatible with x32 (Closes: #1063738)
+   * Revert "Stop building the embedded server to save disk space"
+     (Closes: #1074670)
+ 
+  -- Otto Kekäläinen <otto@debian.org>  Sun, 07 Jul 2024 21:59:40 -0700
+ 
+ mariadb (1:11.4.2-2) unstable; urgency=medium
+ 
+   * Disable the 'mysql*' command deprecation warning
+   * Revert move of 'mysqldump' to compat package to avoid breaking dependencies
+   * Revert move of 'mysqladmin' to compat package to avoid breaking dependencies
+   * Use correct 1:11.0.0 version in Breaks/Replaces (Closes: #1074566)
+ 
+  -- Otto Kekäläinen <otto@debian.org>  Mon, 01 Jul 2024 15:41:57 -0700
+ 
+ mariadb (1:11.4.2-1) unstable; urgency=medium
+ 
+   * New upstream major version 11.4.2. Includes new features as noted at
+     https://mariadb.com/kb/en/mariadb-11-4-2-release-notes/ for this
+     minor release that got announced for General Availabily and
+     https://mariadb.com/kb/en/changes-improvements-in-mariadb-11-4/
+     for an overview of what the MariaDB 11.4 series brings.
+   * Use new '/usr/share/mariadb' path instead of deprecated 'mysql' equivalent
+   * Use new 'mariadb-test' path and name instead of deprecated 'mysql-test'
+   * Use command 'mariadb' instead of deprecated 'mysql'
+   * Don't stop autopkgtest configuration-tracing on errors early
+   * Update server trace to include new parameters and values
+   * Add build/test dependency libnet-ssleay-perl
+   * Partially sync debian/ with upstream MariaDB 11.4.2
+   * Fix all Lintian errors, and more, for MariaDB 11.4.2
+   * Make transitional mariadb-server-10.5 package compatible with 11.4
+   * Stop building the embedded server to save disk space
+   * When shutting down 'mariadbd', fallback to 'mysqld'
+ 
+  -- Otto Kekäläinen <otto@debian.org>  Sun, 23 Jun 2024 21:46:13 -0700
  
  mariadb (1:10.11.8-1) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge