Merge version 1.24.1+dfsg1-1+rpi1 and 1.25.0+dfsg1-2 to produce 1.25.0+dfsg1-2+rpi1

diff --cc debian/changelog
index fae90bf0f69f9dc3e4bfca7bcd1d63311cf08bed,8e5674f2319b7c7c4f736f2e09ab63392f403107..bae5d122a71ff18a0eead1a29598ec2a107f89f6
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,32 +1,43 @@@
- rustc (1.24.1+dfsg1-1+rpi1) buster-staging; urgency=medium
++rustc (1.25.0+dfsg1-2+rpi1) buster-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
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 20 Jun 2018 22:12:21 +0000
++
+ rustc (1.25.0+dfsg1-2) unstable; urgency=medium
+ 
+   * Add patches for LLVM's compiler-rt to fix bugs on sparc64 and mips64.
+     (Closes: #898982)
+   * Install codegen-backends into rustc rather than libstd-rust-dev.
+     (Closes: #899087)
+ 
+  -- Ximin Luo <infinity0@debian.org>  Sat, 19 May 2018 13:10:33 -0700
+ 
+ rustc (1.25.0+dfsg1-1) unstable; urgency=medium
+ 
+   * Upload to unstable.
+   * Allow up to 15 test failures on s390x.
+   * Set CARGO_INCREMENTAL=0 on sparc64.
+ 
+  -- Ximin Luo <infinity0@debian.org>  Fri, 18 May 2018 01:11:15 -0700
+ 
+ rustc (1.25.0+dfsg1-1~exp2) experimental; urgency=medium
+ 
+   * Install missing codegen-backends.
+ 
+  -- Ximin Luo <infinity0@debian.org>  Fri, 06 Apr 2018 14:05:36 -0700
+ 
+ rustc (1.25.0+dfsg1-1~exp1) experimental; urgency=medium
+ 
+   * New upstream release.
+   * Update to LLVM 6.0.
+ 
+  -- Ximin Luo <infinity0@debian.org>  Sun, 01 Apr 2018 15:59:47 +0200
  
  rustc (1.24.1+dfsg1-1) unstable; urgency=medium
  

diff --cc debian/patches/series
Simple merge

diff --cc debian/rules
Simple merge