update debcargo-conf.patch for latest patches

diff --git a/debian/debcargo-conf.patch b/debian/debcargo-conf.patch
index 398f8b177d40720d4db4ce24b95c9035a0a042a3..97471d6091ada24930dee2f9e68b00e5219a172c 100644 (file)
--- a/debian/debcargo-conf.patch
+++ b/debian/debcargo-conf.patch
@@ -1,5 +1,16 @@
-diff --git a/src/commoncrypto-sys/debian/patches/no-clippy.patch b/src/commoncrypto-sys/debian/patches/no-clippy.patch
-index 3e4c885..93789f3 100644
+For various reasons sometimes the debcargo-conf patches can't be applied as-is,
+so we further patch them here. The reasons are as follows:
+
+- commoncrypto, commoncrypto-sys: these crates were released before crates.io
+  automatically re-wrote all Cargo.toml files. cargo-vendor outputs the
+  un-re-written original Cargo.toml files, but debcargo will forcibly rewrite
+  even un-re-written ones that were published to crates.io. The patch below
+  rewrites our existing patches so they work against the un-re-written ones.
+
+- our patch to miniz_oxide replaces the adler dep for the adler32 dep. This
+  interferes with our primitive logic in debian-cargo-vendor, so we have to
+  undo that here.
+
 --- a/src/commoncrypto-sys/debian/patches/no-clippy.patch
 +++ b/src/commoncrypto-sys/debian/patches/no-clippy.patch
 @@ -1,17 +1,16 @@
@@ -31,8 +42,6 @@ index 3e4c885..93789f3 100644
 +-
 + [dev-dependencies]
 + hex = "0.2"
-diff --git a/src/commoncrypto/debian/patches/no-clippy.patch b/src/commoncrypto/debian/patches/no-clippy.patch
-index 38d9c92..b21a7ca 100644
 --- a/src/commoncrypto/debian/patches/no-clippy.patch
 +++ b/src/commoncrypto/debian/patches/no-clippy.patch
 @@ -1,17 +1,16 @@
@@ -64,35 +73,9 @@ index 38d9c92..b21a7ca 100644
 +-
 + [dev-dependencies]
 + hex = "0.2"
-diff --git a/src/unicode-bidi/debian/patches/no-flamegraphs.patch b/src/unicode-bidi/debian/patches/no-flamegraphs.patch
-index 6234d5d..9acab86 100644
---- a/src/unicode-bidi/debian/patches/no-flamegraphs.patch
-+++ b/src/unicode-bidi/debian/patches/no-flamegraphs.patch
-@@ -1,5 +1,5 @@
----- a/Cargo.toml      2017-07-06 23:45:07.000000000 +0000
--+++ b/Cargo.toml      2018-09-15 18:09:13.913086470 +0000
-+--- a/Cargo.toml
-++++ b/Cargo.toml
- @@ -23,13 +23,6 @@
-  
-  [lib]
-@@ -12,12 +12,13 @@
- -version = "0.1"
- -optional = true
-  
-- [dependencies.matches]
-- version = "0.1"
--@@ -44,6 +37,5 @@
-+ [dependencies.serde]
-+ version = ">=0.8, <2.0"
-+@@ -43,7 +36,6 @@
-+ 
-  [features]
-- bench_it = []
-- default = []
-+ with_serde = ["serde"]
- -flame_it = ["flame", "flamer"]
-  unstable = []
-- with_serde = ["serde"]
-+ default = []
-+ bench_it = []
+--- a/src/miniz_oxide/debian/patches/series
++++ b/src/miniz_oxide/debian/patches/series
+@@ -1,3 +1,2 @@
+ remove-rustc-dep-of-std-etc.patch
+ remove-compiler-builtins.patch
+-use-adler32.patch