WIP changelog

[cargo.git] / debian / debcargo-conf.patch

diff --git a/src/commoncrypto-sys/debian/patches/no-clippy.patch b/src/commoncrypto-sys/debian/patches/no-clippy.patch
index 3e4c885..4a43b0d 100644
--- a/src/commoncrypto-sys/debian/patches/no-clippy.patch
+++ b/src/commoncrypto-sys/debian/patches/no-clippy.patch
@@ -1,17 +1,16 @@
 --- a/Cargo.toml	2017-01-24 06:56:51.000000000 +0000
 +++ b/Cargo.toml	2018-09-15 15:37:47.602333479 +0000
-@@ -19,14 +19,8 @@
+@@ -8,13 +8,8 @@
  keywords = ["crypto", "hash", "digest", "osx", "commoncrypto"]
  license = "MIT"
- repository = "https://github.com/malept/rust-commoncrypto"
--[dependencies.clippy]
--version = "0.0"
--optional = true
  
- [dependencies.libc]
- version = "0.2"
- [dev-dependencies.hex]
- version = "0.2"
--
 -[features]
 -lint = ["clippy"]
+-
+ [dependencies]
+ libc = "0.2"
+ 
+-clippy = { version = "0.0", optional = true }
+-
+ [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..1603e39 100644
--- a/src/commoncrypto/debian/patches/no-clippy.patch
+++ b/src/commoncrypto/debian/patches/no-clippy.patch
@@ -1,17 +1,16 @@
 --- a/Cargo.toml	2017-01-24 06:56:51.000000000 +0000
 +++ b/Cargo.toml	2018-09-15 17:37:01.354423224 +0000
-@@ -19,14 +19,8 @@
+@@ -8,13 +8,8 @@
  keywords = ["crypto", "hash", "digest", "osx", "commoncrypto"]
  license = "MIT"
- repository = "https://github.com/malept/rust-commoncrypto"
--[dependencies.clippy]
--version = "0.0"
--optional = true
  
- [dependencies.commoncrypto-sys]
- version = "0.2.0"
- [dev-dependencies.hex]
- version = "0.2"
--
 -[features]
 -lint = ["clippy"]
+-
+ [dependencies]
+ commoncrypto-sys = { version = "0.2.0", path = "../commoncrypto-sys" }
+ 
+-clippy = { version = "0.0", optional = true }
+-
+ [dev-dependencies]
+ hex = "0.2"
diff --git a/src/curl/debian/patches/winapi3.patch b/src/curl/debian/patches/winapi3.patch
index dce2312..a4ab79e 100644
--- a/src/curl/debian/patches/winapi3.patch
+++ b/src/curl/debian/patches/winapi3.patch
@@ -1,19 +1,24 @@
---- a/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
-+++ b/Cargo.toml	2018-09-21 18:54:24.693880364 +0000
-@@ -48,4 +48,2 @@ version = "0.1.2"
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -54,13 +54,12 @@
+ [target."cfg(all(unix, not(target_os = \"macos\")))".dependencies.openssl-sys]
  version = "0.9.33"
--[target."cfg(target_env=\"msvc\")".dependencies.kernel32-sys]
+ optional = true
+-[target."cfg(target_env = \"msvc\")".dependencies.kernel32-sys]
 -version = "0.2.2"
  
-@@ -54,3 +52,4 @@ version = "0.1.13"
+ [target."cfg(target_env = \"msvc\")".dependencies.schannel]
+ version = "0.1.13"
  [target."cfg(windows)".dependencies.winapi]
 -version = "0.2.7"
 +version = "0.3"
 +features = ["winsock2", "wincrypt", "libloaderapi"]
  [badges.appveyor]
---- a/src/easy/windows.rs	2018-09-21 18:01:35.962553903 +0000
-+++ b/src/easy/windows.rs	2018-09-21 18:01:35.962553903 +0000
-@@ -4,21 +4,21 @@ use libc::c_void;
+ repository = "alexcrichton/curl-rust"
+ 
+--- a/src/easy/windows.rs
++++ b/src/easy/windows.rs
+@@ -4,21 +4,21 @@
  
  #[cfg(target_env = "msvc")]
  mod win {
@@ -38,20 +43,20 @@
              if n == ptr::null() {
                  None
              } else {
---- a/src/lib.rs	2018-09-21 18:01:35.962553903 +0000
-+++ b/src/lib.rs	2018-09-21 18:01:35.962553903 +0000
-@@ -61,8 +61,6 @@ extern crate openssl_probe;
- #[cfg(windows)]
+--- a/src/lib.rs
++++ b/src/lib.rs
+@@ -62,8 +62,6 @@
  extern crate winapi;
  
--#[cfg(target_env = "msvc")]
--extern crate kernel32;
  #[cfg(target_env = "msvc")]
+-extern crate kernel32;
+-#[cfg(target_env = "msvc")]
  extern crate schannel;
  
---- a/src/multi.rs	2018-09-21 18:01:35.962553903 +0000
-+++ b/src/multi.rs	2018-09-21 18:01:35.962553903 +0000
-@@ -8,7 +8,7 @@ use libc::{c_int, c_char, c_void, c_long, c_short};
+ use std::ffi::CStr;
+--- a/src/multi.rs
++++ b/src/multi.rs
+@@ -8,7 +8,7 @@
  use curl_sys;
  
  #[cfg(windows)]
diff --git a/src/flate2/debian/patches/disable-miniz.patch b/src/flate2/debian/patches/disable-miniz.patch
index a6f6670..0ac771b 100644
--- a/src/flate2/debian/patches/disable-miniz.patch
+++ b/src/flate2/debian/patches/disable-miniz.patch
@@ -5,11 +5,11 @@
  optional = true
  
 -[dependencies.miniz-sys]
--version = "0.1.7"
+-version = "0.1.11"
 -optional = true
 -
  [dependencies.miniz_oxide_c_api]
- version = "0.1"
+ version = "0.2"
  features = ["no_c_export"]
 @@ -56,7 +52,8 @@
  version = "0.1"
diff --git a/src/flate2/debian/patches/drop-deps-for-cargo.patch b/src/flate2/debian/patches/drop-deps-for-cargo.patch
new file mode 100644
index 0000000..19c4a55
--- /dev/null
+++ b/src/flate2/debian/patches/drop-deps-for-cargo.patch
@@ -0,0 +1,28 @@
+--- flate2.orig/Cargo.toml
++++ flate2/Cargo.toml
+@@ -33,11 +33,6 @@
+ version = "1.0"
+ optional = true
+ 
+-[dependencies.miniz_oxide_c_api]
+-version = "0.2"
+-features = ["no_c_export"]
+-optional = true
+-
+ [dependencies.tokio-io]
+ version = "0.1"
+ optional = true
+@@ -54,12 +49,9 @@
+ [features]
+ default = ["zlib"]
+ miniz-sys = ["zlib"]
+-rust_backend = ["miniz_oxide_c_api"]
++rust_backend = ["zlib"]
+ tokio = ["tokio-io", "futures"]
+ zlib = ["libz-sys"]
+-[target."cfg(all(target_arch = \"wasm32\", not(target_os = \"emscripten\")))".dependencies.miniz_oxide_c_api]
+-version = "0.2"
+-features = ["no_c_export"]
+ [badges.appveyor]
+ repository = "alexcrichton/flate2-rs"
+ 
diff --git a/src/flate2/debian/patches/series b/src/flate2/debian/patches/series
index d42c267..393adff 100644
--- a/src/flate2/debian/patches/series
+++ b/src/flate2/debian/patches/series
@@ -1 +1,2 @@
 disable-miniz.patch
+drop-deps-for-cargo.patch
diff --git a/src/jobserver/debian/patches/relax-dep-version.patch b/src/jobserver/debian/patches/relax-dep-version.patch
index b3218cc..d12faa5 100644
--- a/src/jobserver/debian/patches/relax-dep-version.patch
+++ b/src/jobserver/debian/patches/relax-dep-version.patch
@@ -1,8 +1,8 @@
---- a/Cargo.toml	2018-08-03 01:58:48.002962262 -0700
-+++ b/Cargo.toml	2018-08-03 01:58:54.275006248 -0700
+--- a/Cargo.toml
++++ b/Cargo.toml
 @@ -61,4 +61,4 @@
  [target."cfg(unix)".dependencies.libc]
  version = "0.2"
  [target."cfg(windows)".dependencies.rand]
--version = "0.4"
+-version = "0.6"
 +version = "< 0.6, >= 0.4"
diff --git a/src/openssl-sys/debian/patches/disable-vendor.patch b/src/openssl-sys/debian/patches/disable-vendor.patch
index a4e6d8f..45a0d36 100644
--- a/src/openssl-sys/debian/patches/disable-vendor.patch
+++ b/src/openssl-sys/debian/patches/disable-vendor.patch
@@ -5,7 +5,7 @@
  version = "1.0"
  
 -[build-dependencies.openssl-src]
--version = "110.0.4"
+-version = "111.0.1"
 -optional = true
 -
  [build-dependencies.pkg-config]
diff --git a/src/rand/debian/patches/disable-fuchsia-zircon-dep.diff b/src/rand/debian/patches/disable-fuchsia-zircon-dep.diff
index d5c8ce5..08ca008 100644
--- a/src/rand/debian/patches/disable-fuchsia-zircon-dep.diff
+++ b/src/rand/debian/patches/disable-fuchsia-zircon-dep.diff
@@ -1,11 +1,9 @@
-Index: rand/Cargo.toml
-===================================================================
---- rand.orig/Cargo.toml
-+++ rand/Cargo.toml
-@@ -48,7 +48,7 @@ default = ["std"]
- i128_support = []
- nightly = ["i128_support"]
- serde1 = ["serde", "serde_derive", "rand_core/serde1"]
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -65,7 +65,7 @@
+ nightly = ["simd_support"]
+ serde1 = ["rand_core/serde1", "rand_isaac/serde1", "rand_xorshift/serde1"]
+ simd_support = ["packed_simd"]
 -std = ["rand_core/std", "alloc", "libc", "winapi", "cloudabi", "fuchsia-zircon"]
 +std = ["rand_core/std", "alloc", "libc", "winapi", "cloudabi"]
  [target."cfg(target_os = \"cloudabi\")".dependencies.cloudabi]
diff --git a/src/unicode-bidi/debian/patches/no-flamegraphs.patch b/src/unicode-bidi/debian/patches/no-flamegraphs.patch
index 6234d5d..2c1dce7 100644
--- a/src/unicode-bidi/debian/patches/no-flamegraphs.patch
+++ b/src/unicode-bidi/debian/patches/no-flamegraphs.patch
@@ -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 = []