From: Raspbian automatic forward porter <root@raspbian.org>
Date: Sat, 15 Oct 2022 09:55:38 +0000 (+0100)
Subject: Merge version 1.60.0+dfsg1-1+rpi1 and 1.61.0+dfsg1-2 to produce 1.61.0+dfsg1-2+rpi1
X-Git-Tag: archive/raspbian/1.61.0+dfsg1-2+rpi1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=8c15041221da69bcc51b25ad63edfb45e0f7bce5;p=rustc.git

Merge version 1.60.0+dfsg1-1+rpi1 and 1.61.0+dfsg1-2 to produce 1.61.0+dfsg1-2+rpi1
---

a6348da252bd1e1587185f6546421720a25ab35e
diff --cc debian/changelog
index d34abefeb1,a75f88d848..52e1fbb10b
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,17 -1,31 +1,46 @@@
- rustc (1.60.0+dfsg1-1+rpi1) bookworm-staging; urgency=medium
++rustc (1.61.0+dfsg1-2+rpi1) bookworm-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.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Tue, 13 Sep 2022 03:57:25 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 15 Oct 2022 09:55:37 +0000
++
+ rustc (1.61.0+dfsg1-2) unstable; urgency=medium
+ 
+   [ Ximin Luo]
+   * Improve cross-building documentation
+ 
+   [ Adrian Bunk ]
+   * Disable kernel_user_helpers on armel (duplicate symbols)
+   * Increase allowed failures on armel/mips64el/ppc64 (Closes: #1020860)
+ 
+   [ Fabian Grünbichler ]
+   * cherry-pick patches from Ubuntu
+   * fix rebuild of 1.61 with 1.61
+ 
+  -- Fabian Gruenbichler <debian@fabian.gruenbichler.email>  Mon, 10 Oct 2022 20:19:05 +0200
+ 
+ rustc (1.61.0+dfsg1-1) unstable; urgency=medium
+ 
+   * Upload to unstable (Closes: #1020394)
+ 
+  -- Sylvestre Ledru <sylvestre@debian.org>  Thu, 22 Sep 2022 09:00:21 +0200
+ 
+ rustc (1.61.0+dfsg1-1~exp1) experimental; urgency=medium
+ 
+   * New upstream release
+ 
+   * Switch to LLVM-14 (Closes: #1017656)
+ 
+  -- Fabian Gruenbichler <f.gruenbichler@proxmox.com>  Wed, 07 Sep 2022 17:33:04 +0200
  
  rustc (1.60.0+dfsg1-1) unstable; urgency=medium