Merge tag '1.74.1+dfsg1-1' into trixie-staging

diff --cc debian/architecture.mk
index fb41c65698078f7037cef6fc82f359297ea5eb8d,bbf81eef0514e730a190c9a921597a9fc16f24c7..3cde33a8cc2265e53f6c646eef1b3d2e02054e54
--- 1/debian/architecture.mk
--- 2/debian/architecture.mk
+++ b/debian/architecture.mk
@@@ -3,8 -3,14 +3,13 @@@
  include /usr/share/dpkg/architecture.mk
  
  rust_cpu = $(subst i586,i686,\
- $(if $(findstring -riscv64-,-$(2)-),$(subst riscv64,riscv64gc,$(1)),$(1)))
- rust_type_setvar = $(1)_RUST_TYPE ?= $(call rust_cpu,$($(1)_GNU_CPU),$($(1)_ARCH))-unknown-$($(1)_GNU_SYSTEM)
+ $(if $(findstring -riscv64-,-$(2)-),$(subst riscv64,riscv64gc,$(1)),\
 -$(if $(findstring -armhf-,-$(2)-),$(subst arm,armv7,$(1)),\
+ $(if $(findstring -armel-,-$(2)-),$(subst arm,armv5te,$(1)),\
 -$(1)))))
++$(1))))
+ 
+ rust_os = $(if $(findstring -hurd-,-$(2)-),$(subst gnu,hurd-gnu,$(1)),$1)
+ 
+ rust_type_setvar = $(1)_RUST_TYPE ?= $(call rust_cpu,$($(1)_GNU_CPU),$($(1)_ARCH))-unknown-$(call rust_os,$($(1)_GNU_SYSTEM),$($(1)_ARCH_OS))
  
  $(foreach machine,BUILD HOST TARGET,\
    $(eval $(call rust_type_setvar,DEB_$(machine))))

diff --cc debian/changelog
index 045dd5401ecb3e1597c95ac7d70f610deef2fdab,d54e5dae471f8a1b9455d109da2919fb203647bc..b54fd083312ae7a0337df70df6f711513c52c44b
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,20 -1,21 +1,38 @@@
- rustc (1.73.0+dfsg1-1+rpi1) trixie-staging; urgency=medium
++rustc (1.74.1+dfsg1-1+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>  Sat, 27 Jul 2024 03:37:15 +0000
 +
+ rustc (1.74.1+dfsg1-1) unstable; urgency=medium
+ 
+   * dwz: bump limit to avoid s390x build failures
+ 
+  -- Fabian Grünbichler <debian@fabian.gruenbichler.email>  Thu, 30 May 2024 11:25:53 +0200
+ 
+ rustc (1.74.1+dfsg1-1~exp1) experimental; urgency=medium
+ 
+   [ Fabian Grünbichler ]
+   * New upstream release
+ 
+   [ Samuel Thibault ]
+   * architecture.mk: Adapt to llvm/rust's hurd naming
+   * rules: Disable profiling on Hurd ports, llvm does not provide it yet
+   * rules: Set the number of expected failures on Hurd ports
+ 
+  -- Fabian Grünbichler <debian@fabian.gruenbichler.email>  Wed, 29 May 2024 11:24:48 +0200
+ 
  rustc (1.73.0+dfsg1-1) unstable; urgency=medium
  
    * libstd-rust-1.73: fix ldconfig trigger

diff --cc debian/control
Simple merge

diff --cc debian/rules
Simple merge