Merge version 1:30.1+1-4+rpi1 and 1:30.1+1-5 to produce 1:30.1+1-5+rpi1

diff --cc debian/changelog
index 3311ad9f9f031a3e3c9775d0586e6db9642efe72,f013d87971e8d6f158766a3982a31d62644c0361..5d1870a878ddac058144285b750d4165796ea27b
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,9 +1,17 @@@
- emacs (1:30.1+1-4+rpi1) trixie-staging; urgency=medium
++emacs (1:30.1+1-5+rpi1) trixie-staging; urgency=medium
 +
 +  [changes brought forward from 1:29.4+1-3+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 28 Jul 2024 23:24:37 +0000]
 +  * Switch to gcc 14.
 +  * Disable testsuite.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Wed, 12 Mar 2025 15:21:20 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 09 Apr 2025 17:09:51 +0000
++
+ emacs (1:30.1+1-5) unstable; urgency=medium
+ 
+   * Disable emacs-module-tests.el (Closes: #1101598).
+     These regularly cause FTBFS, i.e., more than just this bug report.
+ 
+  -- Sean Whitton <spwhitton@spwhitton.name>  Sun, 30 Mar 2025 13:26:28 +0800
  
  emacs (1:30.1+1-4) unstable; urgency=medium