Merge tag '1.84.0+dfsg1-2' into trixie-staging

diff --cc debian/changelog
index bd40956f5e96071d640d3faca37daa6c7de0b8e3,b9c358a09fb927401916ec3ad73549f269ee3059..150338c0ec4ff9650087746f5d28d06fa0c5ba02
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,17 -1,27 +1,42 @@@
- rustc (1.83.0+dfsg1-1+rpi1) trixie-staging; urgency=medium
++rustc (1.84.0+dfsg1-2+rpi1) trixie-staging; urgency=medium
 +
 +  [changes brought forward from 1.15.1+dfsg1-1~exp3+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Wed, 15 Mar 2017 10:16:18 +0000]
 +  * Build for armv6.
 +  [changes introduced in 1.18.0+dfsg1-4+rpi1 by Peter Michael Green]
 +  * Disable testsuite.
 +  [changes introduced in 1.37.0+dfsg1-1+rpi1 by Peter Michael Green]
 +  * Set DEB_BUILD_RUST_TYPE based on the compiler that is actually installed.
 +  [changes introduced in 1.42.0+dfsg1-1+rpi1 by Peter Michael Green]
 +  * Use the compiler itself rather than dpkg to detect DEB_BUILD_RUST_TYPE
 +  [changes introduced in 1.57.0+dfsg1-1+rpi1 by Peter Michael Green]
 +  * Disable testsuite for arch all builds as well.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Thu, 30 Jan 2025 22:53:27 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Wed, 05 Feb 2025 10:10:28 +0000
++
+ rustc (1.84.0+dfsg1-2) unstable; urgency=medium
+ 
+   * revert upstream commit breaking cross builds
+   * rust-llvm: ship symlink to llvm-objcopy instead of copy of binary
+ 
+  -- Fabian Grünbichler <debian@fabian.gruenbichler.email>  Tue, 21 Jan 2025 11:38:15 +0100
+ 
+ rustc (1.84.0+dfsg1-1) unstable; urgency=medium
+ 
+   * rust-analyzer: fix build on mips64el
+   * fix hurd build (Closes: #1093125)
+   * d/control: add Conflicts with rustup (Closes: #1093031)
+ 
+  -- Fabian Grünbichler <debian@fabian.gruenbichler.email>  Thu, 16 Jan 2025 20:46:05 +0100
+ 
+ rustc (1.84.0+dfsg1-1~exp1) experimental; urgency=medium
+ 
+   * New upstream release.
+   * Stop building wasm32-wasi target
+   * Build rust-analyzer (Closes: #1052319)
+   * rust-llvm: ship rust-objcopy helper
+   * rust-all: add rust-llvm and rust-analyzer packages
+ 
+  -- Fabian Grünbichler <debian@fabian.gruenbichler.email>  Sat, 11 Jan 2025 16:04:50 +0100
  
  rustc (1.83.0+dfsg1-1) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge