Merge version 1:2.4.1+dfsg1-4+rpi1 and 1:2.4.1+dfsg1-5 to produce 1:2.4.1+dfsg1-5...

diff --cc debian/changelog
index 5b3ad85dec1a29cbf235c0869f4c2cf26e1ca35e,0a45e9089fa593e7dd1850508f8bfb1fb34974b4..e454ff61ac61e7cc7587b510d64de72824e4c419
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,11 +1,18 @@@
- dovecot (1:2.4.1+dfsg1-4+rpi1) trixie-staging; urgency=medium
++dovecot (1:2.4.1+dfsg1-5+rpi1) trixie-staging; urgency=medium
 +
 +  [changes brought forward from 1:2.3.21+dfsg1-3+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 20 Jun 2024 17:16:27 +0000]
 +  * Disablte testsuite.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Wed, 21 May 2025 14:01:29 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 19 Jun 2025 11:02:54 +0000
++
+ dovecot (1:2.4.1+dfsg1-5) unstable; urgency=medium
+ 
+   * [e6e5ef7] Fix typo in conf.d/auth-passwdfile.conf.ext (Closes: #1106072)
+   * [2a34ed0] Import upstream fix for dovecot-lda data loss (Closes: #1106485)
+   * [6c287ea] Fix typo in doveadm-fetch(1) (Closes: #1106533)
+   * [11f8b62] Fix invalid metadata in debian/patches/skip-rfc-subdir.patch
+ 
+  -- Noah Meyerhans <noahm@debian.org>  Wed, 28 May 2025 15:45:52 -0400
  
  dovecot (1:2.4.1+dfsg1-4) unstable; urgency=medium