Merge version 0.33.0-3+rpi1 and 0.35.0-2 to produce 0.35.0-2+rpi1
authorRaspbian automatic forward porter <root@raspbian.org>
Sun, 23 Jun 2019 23:09:16 +0000 (00:09 +0100)
committerRaspbian automatic forward porter <root@raspbian.org>
Sun, 23 Jun 2019 23:09:16 +0000 (00:09 +0100)
1  2 
debian/changelog
debian/patches/series
debian/rules

index ff4e980000629d639eafac37c36cfdaca2235105,fb92f3055c5cafa43a345332f0465dc2d27a0ac3..50e2b37de9f67f9f89d55b082b04b267058629ae
@@@ -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
  
index c558433053b5ce7a8223d5132b7ed2b7680dc633,34dac781a610f74214bc35b32307c617aad22ee7..a3bc9c8eb1298f411895691d3b5340cca0ed7cae
@@@ -1,5 -1,3 +1,5 @@@
- 1003_increase_timeout_for_slow_arches_like_mips.patch
 +#1001_typenum_pr_115.patch
  2002_disable-net-tests.patch
  2005_disable_fetch_cross_tests.patch
+ 2001_more_portable_rustflags.patch
 +logarithm-workaround.patch
diff --cc debian/rules
Simple merge