Merge 1.24.1+dfsg1-1+rpi1 and 1.24.1+dfsg1-1~deb9u2 to produce 1.24.1+dfsg1-1~deb9u2...

diff --cc debian/changelog
index dd88755a6fd0c3d98ca61b149a506f81dd29c28e,fae90bf0f69f9dc3e4bfca7bcd1d63311cf08bed..2741e014e2e3def83385819e8ddcd4fb753f3134
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,19 -1,13 +1,30 @@@
 -rustc (1.24.1+dfsg1-1+rpi1) buster-staging; urgency=medium
++rustc (1.24.1+dfsg1-1~deb9u2+rpi1) stretch-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.24.1+dfsg1-1+rpi1 by Peter Michael Green]
+   * Remove -march=native from src/binaryen/CMakeLists.txt
+ 
 - -- Peter Michael Green <plugwash@raspbian.org>  Fri, 16 Mar 2018 00:05:34 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Thu, 16 Aug 2018 12:03:30 +0000
++
 +rustc (1.24.1+dfsg1-1~deb9u2) stretch; urgency=medium
 +
 +  * Add Build-Depends on rustc [!amd64] to prevent buildds from attempting
 +    further builds, further supported architectures need to be cross-compiled
 +    (Closes: #903118)
 +
 + -- Moritz Mühlenhoff <jmm@debian.org>  Sun, 08 Jul 2018 21:39:35 +0200
 +
 +rustc (1.24.1+dfsg1-1~deb9u1) stretch; urgency=medium
 +
 +  * Build for stretch to be used by Firefox ESR60
 +  * Enable stage0 build
 +  * Disable -doc package, requires packages not found in stretch and
 +    docs are available online anyway
 +
 + -- Moritz Mühlenhoff <jmm@debian.org>  Sun, 01 Jul 2018 13:42:52 +0200
  
  rustc (1.24.1+dfsg1-1) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge