Merge version 1:29.1+1-5+rpi1 and 1:29.2+1-2 to produce 1:29.2+1-2+rpi1

diff --cc debian/changelog
index 602f8f326f3d543bc52d479cc6e94e187a1ad164,c53984fc648780e06a12a778bab688d1e136538a..5e8f09a9c4dade151e6466832b77c7949cb08e8d
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,52 +1,59 @@@
- emacs (1:29.1+1-5+rpi1) trixie-staging; urgency=medium
++emacs (1:29.2+1-2+rpi1) trixie-staging; urgency=medium
 +
++  [changes brought forward from 1:29.1+1-5+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Mon, 09 Oct 2023 00:02:51 +0000]
 +  * Disable testsuite.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Mon, 09 Oct 2023 00:02:51 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 08 Mar 2024 00:36:51 +0000
++
+ emacs (1:29.2+1-2) unstable; urgency=medium
+ 
+   * Fix Breaks/Replaces by prepending missing epoch (Closes: #1064851)
+ 
+  -- Sean Whitton <spwhitton@spwhitton.name>  Tue, 27 Feb 2024 09:26:29 +0800
+ 
+ emacs (1:29.2+1-1) unstable; urgency=medium
+ 
+   [ Rob Browning ]
+   * Give each Emacs flavor its own emacsclient.
+     Move emacsclient from emacs-bin-common to the emacsVER (i.e.
+     emacs-lucid, emacs-gtk, ...) packages so that each one will have the
+     binary that was built for that flavor.
+ 
+     Explicitly list the variant and common bin alternatives instead of
+     globbing.  Add the alternatives variables to deb_sub so we don't need
+     the separate perl -i substitutions.
+ 
+     Stop splitting some of the debian/rules $(call ...) invocations across
+     two lines because it was introducing a space into the argument value
+     which would then break quoted expansions like "$(1)...".
+ 
+     Thanks to Wang Yizhen & others for discussion.
+     Closes: #1050953.  See also: #1043060.
+ 
+   * Generate README.Debian from patch README-Debian psuedo-headers.
+ 
+     Rework debian/patch-to-news to generate the README.Debian entry from a
+     README-Debian DEP-3-style psuedo-header, when present.  The header's
+     syntax is similar to the debian/control Description format.  Among
+     other things, this change makes the common case of cherry-picking
+     upstream patches easier, and less invasive, since in many cases, a
+     simple README-Debian header can be appended while adding the other
+     headers, instead of (as previously) reindenting the upstream commit, etc.
+ 
+   * Adjust debian/patches for the new patch-to-news.
+ 
+   * debian/emacs-common.README.in: drop vestigial ".elc removal" notice.
+     Long irrelevant since switching to base the packaging on the upstream
+     source repository.
+ 
+   * debian/emacs-common.README.in: match NEWS mode/format vars.
+ 
+   [ Sean Whitton ]
+   * Merge upstream version 29.2.
+ 
+   * debian/control: Add Breaks/Replaces for emacsclient package move.
+ 
+  -- Sean Whitton <spwhitton@spwhitton.name>  Mon, 26 Feb 2024 16:55:58 +0800
  
  emacs (1:29.1+1-5) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge