Merge version 1.21.0+dfsg1-3+rpi1 and 1.22.1+dfsg1-1 to produce 1.22.1+dfsg1-1+rpi1

diff --cc debian/changelog
index 0f26e7f94ada9d3a9887bc80f6a4dffed8a76320,28cfadbbae137cb4a46ee2faa73785750ca1e8fa..4bfd334f6d499692953d04a73fab3ab75c2ee6d2
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,23 +1,33 @@@
- rustc (1.21.0+dfsg1-3+rpi1) buster-staging; urgency=medium
++rustc (1.22.1+dfsg1-1+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]
 +  * Fix clean target.
 +  * Build for armv6.
 +  [changes introduced in 1.18.0+dfsg1-4+rpi1 by Peter Michael Green]
 +  * Disable testsuite.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Mon, 13 Nov 2017 23:20:20 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 27 Dec 2017 23:41:13 +0000
++
+ rustc (1.22.1+dfsg1-1) unstable; urgency=medium
+ 
+   [ Ximin Luo ]
+   * Remove unimportant files that autoload remote resources from rust-src.
+   * Fix more symlinks in rust-doc.
+   * On armhf, only generate debuginfo for libstd and not the compiler itself.
+     This works around buildds running out of memory, see upstream #45854.
+   * Update to latest Standards-Version; no changes required.
+ 
+   [ Chris Coulson ]
+   * Fix some test failures that occur because we build rust without an rpath.
+ 
+  -- Ximin Luo <infinity0@debian.org>  Mon, 18 Dec 2017 19:46:25 +0100
+ 
+ rustc (1.22.1+dfsg1-1~exp1) experimental; urgency=medium
+ 
+   * New upstream release.
+   * Fix symlink target. (Closes: #877276)
+ 
+  -- Ximin Luo <infinity0@debian.org>  Sat, 25 Nov 2017 22:29:12 +0100
  
  rustc (1.21.0+dfsg1-3) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge