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

diff --cc debian/changelog
index 486b5ec9096ab014d613f82eb5ccb6799766d7c6,ad3bc27fa18ffd3e14bd330e3d04e7198c62cedf..a98e455321464629ab3c8c8de928892d65b2d663
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,46 +1,54 @@@
- emacs (1:29.4+1-5+rpi1) trixie-staging; urgency=medium
++emacs (1:30.1+1-3+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, 24 Jan 2025 16:30:31 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 07 Mar 2025 11:02:53 +0000
++
+ emacs (1:30.1+1-3) unstable; urgency=high
+ 
+   * Disable server-tests/server-force-stop/keeps-frames on riscv64.
+ 
+   * README.source: Add tasks for separately-packaged built-in libraries.
+ 
+  -- Sean Whitton <spwhitton@spwhitton.name>  Wed, 26 Feb 2025 17:32:48 +0800
+ 
+ emacs (1:30.1+1-2) unstable; urgency=high
+ 
+   * Boost BASE_PURESIZE in attempt to fix build on 32-bit archs.
+     Thanks to Xiyue Deng for help testing.
+ 
+   * Use correct upload urgency given security fixes.
+ 
+  -- Sean Whitton <spwhitton@spwhitton.name>  Tue, 25 Feb 2025 09:21:24 +0800
+ 
+ emacs (1:30.1+1-1) unstable; urgency=medium
+ 
+   * Merge upstream version 30.1 (Closes: #1088690, #1098255, #1098780).
+     - Fixes CVE-2024-53920 and CVE-2025-1244.
+     - Drop obsolete patch disabling flymake included-c-header-files test.
+ 
+   * d/copyright: Updates for Emacs 30.1.
+   * d/rules: Adjust for on-by-default native compilation.
+   * d/control: Bump dependencies of 'emacs' metapackage.
+   * d/control: Remove build dependency on libjansson-dev.
+     This is no longer used by Emacs.
+ 
+   * Fix eldoc warning in patch adding debian-emacs-flavor (Closes: #1095133).
+     Thanks to Xiyue Deng for the report and fix.
+ 
+   * README.source: Suggest using git-range-diff(1) on patch queues.
+   * README.source: Bump version numbers in sample commands.
+ 
+  -- Sean Whitton <spwhitton@spwhitton.name>  Mon, 24 Feb 2025 17:19:10 +0800
+ 
+ emacs (1:29.4+1-6) unstable; urgency=medium
+ 
+   * Disable native compilation on loong64 (Closes: #1095720).
+     Thanks to porter Dandan Zhang.
+ 
+  -- Sean Whitton <spwhitton@spwhitton.name>  Wed, 12 Feb 2025 08:39:57 +0800
  
  emacs (1:29.4+1-5) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge