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

diff --cc debian/changelog
index a98e455321464629ab3c8c8de928892d65b2d663,5c850a2e14f229c20514b473fedaf75bade80025..3311ad9f9f031a3e3c9775d0586e6db9642efe72
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,13 +1,21 @@@
- emacs (1:30.1+1-3+rpi1) trixie-staging; urgency=medium
++emacs (1:30.1+1-4+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>  Fri, 07 Mar 2025 11:02:53 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 12 Mar 2025 15:21:20 +0000
++
+ emacs (1:30.1+1-4) unstable; urgency=medium
+ 
+   * Add "Breaks: dh-elpa-helper (<< 2.1.7)" to flavour binary packages.
+     Certain addons fail to byte-compile against Emacs 30 unless the
+     newer dh-elpa-helper is made available first.
+     It is believed, but not confirmed, that this is due to how the
+     latest dh-elpa-helper compiles addons using byte-recompile-directory
+     instead of batch-byte-compile.
+ 
+  -- Sean Whitton <spwhitton@spwhitton.name>  Thu, 06 Mar 2025 18:44:41 +0800
  
  emacs (1:30.1+1-3) unstable; urgency=high