Merge version 1.12.5-1+rpi1 and 1.12.9-1 to produce 1.12.9-1+rpi1

diff --cc debian/changelog
index 55b22fc7e27efac777f5768a7ed130e309dcc4ec,279c89acea607fc28aa74169972434577a65983d..d1805d53f18cb8a028c10cadd54a84bab87606ee
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,60 +1,68 @@@
- maildir-utils (1.12.5-1+rpi1) trixie-staging; urgency=medium
++maildir-utils (1.12.9-1+rpi1) trixie-staging; urgency=medium
 +
++  [changes brought forward from 1.12.5-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 27 Jun 2024 22:55:19 +0000]
 +  * Link with libatomic on armhf too.
 +  * Disable testsuite.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Thu, 27 Jun 2024 22:55:19 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 20 Aug 2025 13:46:03 +0000
++
+ maildir-utils (1.12.9-1) unstable; urgency=medium
+ 
+   * New upstream version 1.12.9
+     - mu
+       + the cleanup phase after indexing is significantly faster now
+     - mu4e
+       + new command `mu4e-analyze-last-query` which shows information about
+         how the server interpreted the last query.
+       + When you ask for bookmarks or maildirs through `mu4e-search-bookmark`
+         or `mu4e-search-maildir`, unread counts are displayed in the (default)
+         completions UI next to the maildir or bookmark.
+       + A (experimental) "transient" menu has been added.
+       + Various Gnus' mailing list commands are now available in the mu4e
+         message view as well.
+       + The mu server uses PCRE-compatible regexps (for addresses), which are
+         not necessarily compatible with Emacs regular expressions. However,
+         mu4e can now automatically translate; this depends on the `pcre2el`
+         package which the user should install when using regular
+         expression-addresses.
+   * d/patches
+     - refresh patches
+     - add patch to fix single-quoted strings in man-page
+     - add patch to escape back-slashes in man-page
+   * d/control
+     - bump Standards-Version to 4.7.2
+ 
+  -- Jeremy Sowden <azazel@debian.org>  Mon, 10 Mar 2025 22:07:50 +0000
+ 
+ maildir-utils (1.12.8-1) unstable; urgency=medium
+ 
+   * New upstream version 1.12.8
+   * d/patches: refresh patches
+   * d/gitlab-ci.yml: rename to salsa-ci.yml
+ 
+  -- Jeremy Sowden <azazel@debian.org>  Sun, 29 Dec 2024 11:55:27 +0000
+ 
+ maildir-utils (1.12.7-1) unstable; urgency=medium
+ 
+   * New upstream version 1.12.7
+   * d/patches: refresh patches
+ 
+  -- Jeremy Sowden <azazel@debian.org>  Sat, 02 Nov 2024 11:58:23 +0000
+ 
+ maildir-utils (1.12.6-1) unstable; urgency=medium
+ 
+   * New upstream version 1.12.6
+ 
+  -- Jeremy Sowden <azazel@debian.org>  Sat, 10 Aug 2024 14:03:33 +0100
+ 
+ maildir-utils (1.12.5-2) unstable; urgency=medium
+ 
+   * Team upload.
+   * Rebuild against dh-elpa 2.1.5.
+     Upload pushed to dgit-repos but not salsa.
+     See <https://lists.debian.org/debian-emacsen/2024/07/msg00077.html>.
+ 
+  -- Sean Whitton <spwhitton@spwhitton.name>  Thu, 25 Jul 2024 22:42:11 +0900
  
  maildir-utils (1.12.5-1) unstable; urgency=medium