diff -Nru cargo-0.35.0/debian/changelog cargo-0.35.0/debian/changelog
--- cargo-0.35.0/debian/changelog	2019-06-08 18:04:43.000000000 +0000
+++ cargo-0.35.0/debian/changelog	2019-06-23 23:09:16.000000000 +0000
@@ -1,3 +1,14 @@
+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.
+
+ -- 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.
diff -Nru cargo-0.35.0/debian/patches/auto-0.35.0-2+rpi1-5aea641973517331f3cd33e0e7c8e28e2ce930e5-1561331366 cargo-0.35.0/debian/patches/auto-0.35.0-2+rpi1-5aea641973517331f3cd33e0e7c8e28e2ce930e5-1561331366
--- cargo-0.35.0/debian/patches/auto-0.35.0-2+rpi1-5aea641973517331f3cd33e0e7c8e28e2ce930e5-1561331366	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.35.0/debian/patches/auto-0.35.0-2+rpi1-5aea641973517331f3cd33e0e7c8e28e2ce930e5-1561331366	2019-06-23 23:09:16.000000000 +0000
@@ -0,0 +1,39 @@
+From: Raspbian forward porter <root@raspbian.org>
+Subject: Automatically generated patch (0.35.0-2+rpi1)
+
+Last (up to) 3 git changes, FYI:
+
+commit 5aea641973517331f3cd33e0e7c8e28e2ce930e5
+Author: Raspbian automatic forward porter <root@raspbian.org>
+Date:   Mon Jun 24 00:09:21 2019 +0100
+
+    Defuzz fuzzy quilt patches and/or disable broken quilt patches
+
+commit 61419a9eb5442d20dff134010f316667a9827bbf
+Merge: 6e55574ed 3b1b88e08
+Author: Raspbian automatic forward porter <root@raspbian.org>
+Date:   Mon Jun 24 00:09:16 2019 +0100
+
+    Merge version 0.33.0-3+rpi1 and 0.35.0-2 to produce 0.35.0-2+rpi1
+
+commit 3b1b88e08c83b03469c9a98c3237317c7eb5c330
+Merge: 44a4e2c4b 37eb86376
+Author: Ximin Luo <infinity0@debian.org>
+Date:   Sat Jun 8 19:04:43 2019 +0100
+
+    Merge cargo (0.35.0-2) import into refs/heads/workingbranch
+---
+
+--- cargo-0.35.0.orig/vendor/typenum/build/main.rs
++++ cargo-0.35.0/vendor/typenum/build/main.rs
+@@ -77,8 +77,8 @@ pub fn no_std() {}
+ fn main() {
+     let highest: u64 = 1024;
+ 
+-    let first2: u32 = (highest as f64).log(2.0).round() as u32 + 1;
+-    let first10: u32 = (highest as f64).log(10.0) as u32 + 1;
++    let first2: u32 = 11;//(highest as f64).log(2.0) as u32 + 1;
++    let first10: u32 = 4;//(highest as f64).log(10.0) as u32 + 1;
+     let uints = (0..(highest + 1))
+         .chain((first2..64).map(|i| 2u64.pow(i)))
+         .chain((first10..20).map(|i| 10u64.pow(i)));
diff -Nru cargo-0.35.0/debian/patches/logarithm-workaround.patch cargo-0.35.0/debian/patches/logarithm-workaround.patch
--- cargo-0.35.0/debian/patches/logarithm-workaround.patch	1970-01-01 00:00:00.000000000 +0000
+++ cargo-0.35.0/debian/patches/logarithm-workaround.patch	2019-06-23 23:09:16.000000000 +0000
@@ -0,0 +1,29 @@
+Description:  Add workaround for apparently miscalculated logarithms.
+Author: Peter Michael Green <plugwash@raspbian.org>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: https://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: 2019-03-02
+
+--- cargo-0.33.0.orig/vendor/typenum/build/main.rs
++++ cargo-0.33.0/vendor/typenum/build/main.rs
+@@ -77,8 +77,8 @@ pub fn no_std() {}
+ fn main() {
+     let highest: u64 = 1024;
+ 
+-    let first2: u32 = (highest as f64).log(2.0) as u32 + 1;
+-    let first10: u32 = (highest as f64).log(10.0) as u32 + 1;
++    let first2: u32 = 11;//(highest as f64).log(2.0) as u32 + 1;
++    let first10: u32 = 4;//(highest as f64).log(10.0) as u32 + 1;
+     let uints = (0..(highest + 1))
+         .chain((first2..64).map(|i| 2u64.pow(i)))
+         .chain((first10..20).map(|i| 10u64.pow(i)));
diff -Nru cargo-0.35.0/debian/patches/series cargo-0.35.0/debian/patches/series
--- cargo-0.35.0/debian/patches/series	2019-06-07 06:08:29.000000000 +0000
+++ cargo-0.35.0/debian/patches/series	2019-06-23 23:09:16.000000000 +0000
@@ -1,3 +1,4 @@
 2002_disable-net-tests.patch
 2005_disable_fetch_cross_tests.patch
 2001_more_portable_rustflags.patch
+auto-0.35.0-2+rpi1-5aea641973517331f3cd33e0e7c8e28e2ce930e5-1561331366
diff -Nru cargo-0.35.0/debian/rules cargo-0.35.0/debian/rules
--- cargo-0.35.0/debian/rules	2019-05-31 07:07:18.000000000 +0000
+++ cargo-0.35.0/debian/rules	2019-06-23 23:09:16.000000000 +0000
@@ -39,7 +39,7 @@
 	$(CARGO) doc
 
 override_dh_auto_test-arch:
-	CFG_DISABLE_CROSS_TESTS=1 $(CARGO) test $(CARGO_TEST_FLAGS)
+	# CFG_DISABLE_CROSS_TESTS=1 $(CARGO) test $(CARGO_TEST_FLAGS)
 
 override_dh_auto_test-indep:
 	# no arch-indep tests