Merge version 1.40.0+dfsg1-5+rpi1 and 1.42.0+dfsg1-1 to produce 1.42.0+dfsg1-1+rpi1

diff --cc debian/changelog
index 5758815980a6ddeb23475520684f59fab0c520ae,848afc46838ee94e2676c07da7cb9b8c76baa88a..51df1abf1e2bc4d204ce2e107bdd5cdacbbaa995
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,37 +1,48 @@@
- rustc (1.40.0+dfsg1-5+rpi1) bullseye-staging; urgency=medium
++rustc (1.42.0+dfsg1-1+rpi1) bullseye-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.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sat, 11 Jan 2020 11:16:08 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 19 Apr 2020 08:07:33 +0000
++
+ rustc (1.42.0+dfsg1-1) unstable; urgency=medium
+ 
+   * Upload to unstable.
+ 
+  -- Ximin Luo <infinity0@debian.org>  Fri, 10 Apr 2020 11:33:25 +0100
+ 
+ rustc (1.42.0+dfsg1-1~exp1) experimental; urgency=medium
+ 
+   [ Fabian Grünbichler ]
+   * Team upload.
+   * New upstream release.
+ 
+  -- Ximin Luo <infinity0@debian.org>  Sat, 04 Apr 2020 16:06:03 +0100
+ 
+ rustc (1.41.1+dfsg1-1) unstable; urgency=medium
+ 
+   * Upload to unstable.
+ 
+  -- Ximin Luo <infinity0@debian.org>  Fri, 03 Apr 2020 23:41:11 +0100
+ 
+ rustc (1.41.1+dfsg1-1~exp1) experimental; urgency=medium
+ 
+   [ Ximin Luo ]
+   * More python 2 -> 3 fixes.
+   * Enable the wasm32-wasi target for code that needs a "real" libstd.
+   * Don't strip static rlibs. This sometimes breaks wasm, and more generally
+     the stripped debuginfo is actually totally lost rather than being moved
+     into the -dbgsym packages. Shared libraries are unaffected and work.
+   * Allow 180 failing tests on riscv64, none were actually run last time.
+ 
+   [ Fabian Grünbichler ]
+   * New upstream release.
+ 
+  -- Ximin Luo <infinity0@debian.org>  Mon, 09 Mar 2020 00:31:34 +0000
  
  rustc (1.40.0+dfsg1-5) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge