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

diff --cc debian/changelog
index 9e8fac0e0c59722ac8352ea41cd07742fd7d09d5,cfe3de3634b3ecd0235a91285bffcfd907e6e93a..b7314409bc6746dd5061dc6dd03eb308884cb25a
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,20 -1,30 +1,47 @@@
- rustc (1.78.0+dfsg1-2+rpi1) trixie-staging; urgency=medium
++rustc (1.79.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.
 +  [changes introduced in 1.70.0+dfsg1-7+rpi2 by Peter Micheal Green]
 +  * Remove max version constraint from wasi-libc build-dependency.
 +
 + -- Peter Michael Green <plugwash@raspbian.org>  Tue, 20 Aug 2024 16:58:51 +0000
 +
+ rustc (1.79.0+dfsg1-2) unstable; urgency=medium
+ 
+   [ Fabian Grünbichler ]
+   * build: remove more cache files (Closes: #1074373)
+   * d/control: update Standards-Version to 4.7.0
+ 
+   [ Samuel Thibault ]
+   * Avoid hurd-stuck test
+ 
+  -- Fabian Grünbichler <debian@fabian.gruenbichler.email>  Thu, 27 Jun 2024 14:30:53 +0200
+ 
+ rustc (1.79.0+dfsg1-1) unstable; urgency=medium
+ 
+   * cargo wrapper: switch to config.toml
+   * cargo wrapper: ensure debug symbols are not stripped
+   * add missing rustfmt dependency (Closes: #1074290)
+ 
+  -- Fabian Grünbichler <debian@fabian.gruenbichler.email>  Wed, 26 Jun 2024 08:36:52 +0200
+ 
+ rustc (1.79.0+dfsg1-1~exp1) experimental; urgency=medium
+ 
+   * New upstream release
+   * New wasi-libc version (SDK 22)
+   * config: adapt to new change tracking mechanism
+ 
+  -- Fabian Grünbichler <debian@fabian.gruenbichler.email>  Tue, 25 Jun 2024 09:40:12 +0200
+ 
  rustc (1.78.0+dfsg1-2) unstable; urgency=medium
  
    * unbreak loongson64 build

diff --cc debian/control
index d20a908db2889b75deec5e79dc6c22bf5e4a5b29,c89a8027b068da0bb4e133892680abbdbe77e310..e038b668a0943c83efada67965e67e0f9d47dc63
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -52,10 -52,11 +52,10 @@@ Build-Depends
   curl <pkg.rustc.dlstage0>,
   ca-certificates <pkg.rustc.dlstage0>,
  Build-Depends-Indep:
-  wasi-libc (>= 0.0~git20230821.ec4566b~~) <!nowasm>,
+  wasi-libc (>= 0.0~git20240411.9e8c542~~) <!nowasm>,
 - wasi-libc (<= 0.0~git20240411.9e8c542++) <!nowasm>,
   clang-17:native,
  Build-Conflicts: gdb-minimal <!nocheck>
- Standards-Version: 4.6.2
+ Standards-Version: 4.7.0
  Homepage: http://www.rust-lang.org/
  Vcs-Git: https://salsa.debian.org/rust-team/rust.git
  Vcs-Browser: https://salsa.debian.org/rust-team/rust

diff --cc debian/rules
Simple merge