From: Raspbian forward pporter <root@raspbian.org>
Date: Tue, 13 Mar 2018 02:30:48 +0000 (+0000)
Subject: Merge version 1.22.1+dfsg1-2+rpi1 and 1.23.0+dfsg1-1 to produce 1.23.0+dfsg1-1+rpi1
X-Git-Tag: archive/raspbian/1.23.0+dfsg1-1+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=47de8c5ae04cfc6786534d461f91de2ef7ad9850;p=rustc.git

Merge version 1.22.1+dfsg1-2+rpi1 and 1.23.0+dfsg1-1 to produce 1.23.0+dfsg1-1+rpi1
---

47de8c5ae04cfc6786534d461f91de2ef7ad9850
diff --cc debian/changelog
index 68b35d1f1c,4810d874ca..f9d91ada04
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,15 +1,25 @@@
- rustc (1.22.1+dfsg1-2+rpi1) buster-staging; urgency=medium
++rustc (1.23.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.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sun, 07 Jan 2018 18:13:16 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 13 Mar 2018 02:30:48 +0000
++
+ rustc (1.23.0+dfsg1-1) unstable; urgency=medium
+ 
+   * Upload to unstable.
+ 
+  -- Ximin Luo <infinity0@debian.org>  Fri, 19 Jan 2018 11:49:31 +0100
+ 
+ rustc (1.23.0+dfsg1-1~exp1) experimental; urgency=medium
+ 
+   * New upstream release.
+   * Update to latest Standards-Version; no changes required.
+ 
+  -- Ximin Luo <infinity0@debian.org>  Sun, 14 Jan 2018 00:08:17 +0100
  
  rustc (1.22.1+dfsg1-2) unstable; urgency=medium