Merge version 1.39.0+dfsg1-4+rpi1 and 1.40.0+dfsg1-1 to produce 1.40.0+dfsg1-1+rpi1

diff --cc debian/changelog
index 605c0fafc87deb0303b42e1f436c8d8e24277378,5e3f1e2bf0608525bcf49b689fc59279eb9ca8e6..d0e321ce7b71fd5c6b9b9e807ea9d8744a44dba0
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,15 +1,26 @@@
- rustc (1.39.0+dfsg1-4+rpi1) bullseye-staging; urgency=medium
++rustc (1.40.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.
 +
-  -- Peter Micheal Green <plugwash@raspbian.org>  Sat, 28 Dec 2019 09:52:57 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 10 Jan 2020 02:01:57 +0000
++
+ rustc (1.40.0+dfsg1-1) unstable; urgency=medium
+ 
+   * Upload to unstable.
+   * Ignore new test failing on arm that also fails in previous versions.
+ 
+  -- Ximin Luo <infinity0@debian.org>  Sun, 29 Dec 2019 22:17:04 +0000
+ 
+ rustc (1.40.0+dfsg1-1~exp1) experimental; urgency=medium
+ 
+   * New upstream release.
+ 
+  -- Ximin Luo <infinity0@debian.org>  Wed, 25 Dec 2019 00:09:24 +0000
  
  rustc (1.39.0+dfsg1-4) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge