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

diff --cc debian/changelog
index 5d1870a878ddac058144285b750d4165796ea27b,5139e492c6bd4b09a0997ac1266b882cd1146166..222047fd7fcc625b90d0a5c193d1bccd5e9c1933
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,9 +1,17 @@@
- emacs (1:30.1+1-5+rpi1) trixie-staging; urgency=medium
++emacs (1:30.1+1-6+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, 09 Apr 2025 17:09:51 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 01 Aug 2025 17:33:02 +0000
++
+ emacs (1:30.1+1-6) unstable; urgency=medium
+ 
+   * Add Breaks/Replaces/Provides for builtin packages in this release.
+     See #1103033.  Thanks to Xiyue Deng for the patch.
+ 
+  -- Sean Whitton <spwhitton@spwhitton.name>  Fri, 18 Jul 2025 09:58:11 +0100
  
  emacs (1:30.1+1-5) unstable; urgency=medium