From: Raspbian automatic forward porter <root@raspbian.org>
Date: Sun, 23 Jun 2019 23:09:16 +0000 (+0100)
Subject: Merge version 0.33.0-3+rpi1 and 0.35.0-2 to produce 0.35.0-2+rpi1
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=61419a9eb5442d20dff134010f316667a9827bbf;p=cargo.git

Merge version 0.33.0-3+rpi1 and 0.35.0-2 to produce 0.35.0-2+rpi1
---

61419a9eb5442d20dff134010f316667a9827bbf
diff --cc debian/changelog
index ff4e98000,fb92f3055..50e2b37de
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,15 +1,26 @@@
- cargo (0.33.0-3+rpi1) buster-staging; urgency=medium
++cargo (0.35.0-2+rpi1) buster-staging; urgency=medium
 +
 +  [changes brought forward from 0.33.0-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 02 Mar 2019 11:51:21 +0000]
 +  * Add workaround for apparently miscalculated logarithms in typenum.
 +
 +  [changes introduced in 0.33.0-3+rpi1 by Peter Michael Green]
 +  * Revert 1001_typenum_pr_115.patch , it conflicts with our typenum patch.
 +  * Disable testsuite.
 +
-  -- Peter Micheal Green <plugwash@raspbian.org>  Thu, 06 Jun 2019 16:18:44 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 23 Jun 2019 23:09:16 +0000
++
+ cargo (0.35.0-2) unstable; urgency=medium
+ 
+   * Use more portable flags in tests, fixing FTBFS on mips.
+     (Closes: #930218)
+ 
+  -- Ximin Luo <infinity0@debian.org>  Sat, 08 Jun 2019 11:04:43 -0700
+ 
+ cargo (0.35.0-1) unstable; urgency=medium
+ 
+   * New upstream release.
+ 
+  -- Ximin Luo <infinity0@debian.org>  Fri, 31 May 2019 00:29:11 -0700
  
  cargo (0.33.0-3) unstable; urgency=medium
  
diff --cc debian/patches/series
index c55843305,34dac781a..a3bc9c8eb
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,5 -1,3 +1,5 @@@
 +#1001_typenum_pr_115.patch
- 1003_increase_timeout_for_slow_arches_like_mips.patch
  2002_disable-net-tests.patch
  2005_disable_fetch_cross_tests.patch
+ 2001_more_portable_rustflags.patch
 +logarithm-workaround.patch