From: Raspbian automatic forward porter <root@raspbian.org>
Date: Thu, 20 Feb 2025 13:35:21 +0000 (+0000)
Subject: Merge version 1:29.4+1-5+rpi1 and 1:29.4+1-6 to produce 1:29.4+1-6+rpi1
X-Git-Tag: archive/raspbian/1%29.4+1-6+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=99c161e24d465b3ce112caf2a04168acefe99f00;p=emacs.git

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

99c161e24d465b3ce112caf2a04168acefe99f00
diff --cc debian/changelog
index 486b5ec9096,eab08f35e64..1ec494614a0
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,9 +1,17 @@@
- emacs (1:29.4+1-5+rpi1) trixie-staging; urgency=medium
++emacs (1:29.4+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>  Fri, 24 Jan 2025 16:30:31 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 20 Feb 2025 13:35:21 +0000
++
+ 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