From: Raspbian automatic forward porter <root@raspbian.org>
Date: Fri, 24 Jan 2025 16:30:31 +0000 (+0000)
Subject: Merge version 1:29.4+1-4+rpi1 and 1:29.4+1-5 to produce 1:29.4+1-5+rpi1
X-Git-Tag: archive/raspbian/1%29.4+1-5+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=1304499e2d3d732b7c0438216eea136aaf63b5e0;p=emacs.git

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

1304499e2d3d732b7c0438216eea136aaf63b5e0
diff --cc debian/changelog
index e311f93ce4c,43d4de39ec0..486b5ec9096
--- a/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