Manual merge of version 1.59.0+dfsg1-1~deb10u3+rpi1 and 1.63.0+dfsg1-2~deb10u2 to...

diff --cc debian/changelog
index 1ad89a2ddbd674a1260ee571f795795bd4d1a81b,cd4f5c99715e7e184d62459e41a5172e87750e61..1357cffbe3a1845c34b884ba81b1dfe6b953e68e
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,27 -1,4 +1,18 @@@
- rustc-mozilla (1.59.0+dfsg1-1~deb10u3+rpi1) buster-staging; urgency=medium
++rustc-mozilla (1.63.0+dfsg1-2~deb10u2+rpi1) buster-staging; urgency=medium
 +
 +  [changes brought over from rustc 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 rustc 1.18.0+dfsg1-4+rpi1 by Peter Michael Green]
 +  * Disable testsuite.
 +
 +  [changes introduced in rustc-mozilla 1.51.0+dfsg1-1~deb11u1+rpi1 by Peter Michael Green]
 +  * Force DEB_BUILD_RUST_TYPE to armv7-unknown-linux-gnueabih as that is what we have a stage0 compiler for.
 +  * Use DEB_BUILD_RUST_TYPE not DEB_HOST_RUST_TYPE when looking for a stage0 compiler.
 +
-   [changes introduced in rustc-mozilla 1.59.0+dfsg1-1~deb11u3+rpi1 by Peter Michael Green]
-   * Disable mips symlinking code that is failing with a "file exists" error.
++ -- Peter Michael Green <plugwash@raspbian.org>  Wed, 20 Sep 2023 01:10:24 +0000
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 24 Nov 2022 18:29:06 +0000
- 
- rustc-mozilla (1.59.0+dfsg1-1~deb10u3) buster; urgency=medium
- 
-   * Include mips(el) stage0 binaries.
- 
-  -- Emilio Pozuelo Monfort <pochu@debian.org>  Thu, 04 Aug 2022 09:50:12 +0200
- 
- rustc-mozilla (1.59.0+dfsg1-1~deb10u2) buster; urgency=medium
+ rustc-mozilla (1.63.0+dfsg1-2~deb10u2) buster-security; urgency=medium
  
    * Inline atomics on arm64.
    * Increase allowed test failures on i386.

diff --cc debian/rules
index dd7110c4adf6fb582f00ed00050cf23852d3cff2,b21a7e59f157c00683c460b0ea5d2e396af033aa..bce1e59c4d11cf97d9212689c1d58453b1e56a9e
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -73,7 -73,7 +73,7 @@@ update-version
  # README.Debian for more details of the cases described below.
  #
  PRECONFIGURE_CHECK = :
- HAVE_BINARY_TARBALL := $(shell ls -1 stage0*/*/*$(DEB_BUILD_RUST_TYPE)* 2>/dev/null | wc -l)
 -HAVE_BINARY_TARBALL := $(shell ls -1 stage0/*/*$(DEB_HOST_RUST_TYPE)* 2>/dev/null | wc -l)
++HAVE_BINARY_TARBALL := $(shell ls -1 stage0/*/*$(DEB_BUILD_RUST_TYPE)* 2>/dev/null | wc -l)
  DOWNLOAD_BOOTSTRAP := false
  # allow not using the binary tarball although it exists
  #ifneq (,$(filter $(DEB_HOST_ARCH), amd64 arm64 armhf i386 powerpc ppc64el s390x))