From: Raspbian forward pporter <root@raspbian.org>
Date: Thu, 2 Nov 2017 21:52:11 +0000 (+0000)
Subject: Merge version 1.19.0+dfsg3-4+rpi1 and 1.20.0+dfsg1-1 to produce 1.20.0+dfsg1-1+rpi1
X-Git-Tag: archive/raspbian/1.20.0+dfsg1-1+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=649330be9cd4077f09137b3c5db8f36406175ebe;p=rustc.git

Merge version 1.19.0+dfsg3-4+rpi1 and 1.20.0+dfsg1-1 to produce 1.20.0+dfsg1-1+rpi1
---

649330be9cd4077f09137b3c5db8f36406175ebe
diff --cc debian/changelog
index 00290f270e,d7a20ea2e9..9e1a8fad0f
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,8 +1,18 @@@
- rustc (1.19.0+dfsg3-4+rpi1) buster-staging; urgency=medium
++rustc (1.20.0+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>  Thu, 02 Nov 2017 12:17:13 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 02 Nov 2017 21:52:10 +0000
++
+ rustc (1.20.0+dfsg1-1) experimental; urgency=medium
+ 
+   * New upstream release.
+ 
+  -- Ximin Luo <infinity0@debian.org>  Sun, 15 Oct 2017 23:30:35 +0200
  
  rustc (1.19.0+dfsg3-4) unstable; urgency=medium