From: Raspbian automatic forward porter <root@raspbian.org>
Date: Thu, 20 Jun 2019 16:10:52 +0000 (+0100)
Subject: Merge version 1.33.0+dfsg1-2+rpi1 and 1.34.2+dfsg1-1 to produce 1.34.2+dfsg1-1+rpi1
X-Git-Tag: archive/raspbian/1.34.2+dfsg1-1+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=021b4be62b1f620a7eff717ad859efa89850c152;p=rustc.git

Merge version 1.33.0+dfsg1-2+rpi1 and 1.34.2+dfsg1-1 to produce 1.34.2+dfsg1-1+rpi1
---

021b4be62b1f620a7eff717ad859efa89850c152
diff --cc debian/changelog
index 321a0e8370,e301349684..27eb968ea9
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,24 +1,33 @@@
- rustc (1.33.0+dfsg1-2+rpi1) buster-staging; urgency=medium
++rustc (1.34.2+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]
 +  * Build for armv6.
 +  [changes introduced in 1.18.0+dfsg1-4+rpi1 by Peter Michael Green]
 +  * Disable testsuite.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 20 Jun 2019 09:49:06 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 20 Jun 2019 16:10:45 +0000
++
+ rustc (1.34.2+dfsg1-1) unstable; urgency=medium
+ 
+   * Don't use system compiler-rt, there are issues with that for now.
+   * Downgrade back to LLVM 7, easier for the buster release.
+ 
+  -- Ximin Luo <infinity0@debian.org>  Wed, 29 May 2019 21:52:37 -0700
+ 
+ rustc (1.34.2+dfsg1-1~exp2) experimental; urgency=medium
+ 
+   * Fix doc build, add version 1 compat mode hack for mdBook 2.
+   * Use system compiler-rt from libclang-common-*-dev.
+ 
+  -- Ximin Luo <infinity0@debian.org>  Fri, 24 May 2019 00:39:59 -0700
+ 
+ rustc (1.34.2+dfsg1-1~exp1) experimental; urgency=medium
+ 
+   * Ensure Cargo.toml is in rust-src.
+   * New upstream release.
+   * Update to LLVM 8.
+ 
+  -- Ximin Luo <infinity0@debian.org>  Sun, 19 May 2019 02:40:02 -0700
  
  rustc (1.33.0+dfsg1-2) unstable; urgency=medium