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

diff --cc debian/changelog
index e311f93ce4cf811f6233656ba2a9a9cde7633c8d,43d4de39ec05af9d9b6b965e2cd913d95b43f84f..486b5ec9096ab014d613f82eb5ccb6799766d7c6
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,8 +1,16 @@@
- emacs (1:29.4+1-4+rpi1) trixie-staging; urgency=medium
++emacs (1:29.4+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>  Fri, 20 Dec 2024 07:50:01 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 24 Jan 2025 16:30:31 +0000
++
+ emacs (1:29.4+1-5) unstable; urgency=medium
+ 
+   * Update to GCC 14 (Closes: #1092655).
+ 
+  -- Sean Whitton <spwhitton@spwhitton.name>  Mon, 13 Jan 2025 08:45:01 +0000
  
  emacs (1:29.4+1-4) unstable; urgency=medium