diff --git a/src/cargo/debian/changelog b/src/cargo/debian/changelog index 6bbe9d4..2c40c03 100644 --- a/src/cargo/debian/changelog +++ b/src/cargo/debian/changelog @@ -1,9 +1,3 @@ -rust-cargo (0.47.0-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium - - * Package cargo 0.47.0 from crates.io using debcargo 2.4.3 - - -- Ximin Luo Thu, 01 Oct 2020 22:03:19 +0100 - rust-cargo (0.43.1-3) unstable; urgency=medium * Team upload. diff --git a/src/cargo/debian/patches/disable-pretty-env-logger.patch b/src/cargo/debian/patches/disable-pretty-env-logger.patch index d518f76..ed9c0ca 100644 --- a/src/cargo/debian/patches/disable-pretty-env-logger.patch +++ b/src/cargo/debian/patches/disable-pretty-env-logger.patch @@ -2,7 +2,7 @@ +++ b/Cargo.toml @@ -125,4 +125,0 @@ -[dependencies.pretty_env_logger] --version = "0.4" +-version = "0.3" -optional = true - @@ -188,1 +184,1 @@ diff --git a/src/cargo/debian/patches/disable-vendor.patch b/src/cargo/debian/patches/disable-vendor.patch index 04431db..f6fcfb9 100644 --- a/src/cargo/debian/patches/disable-vendor.patch +++ b/src/cargo/debian/patches/disable-vendor.patch @@ -1,11 +1,11 @@ --- a/Cargo.toml +++ b/Cargo.toml -@@ -194,7 +194,7 @@ +@@ -196,7 +196,7 @@ [features] deny-warnings = [] pretty-env-logger = ["pretty_env_logger"] -vendored-openssl = ["openssl/vendored"] +vendored-openssl = ["openssl"] [target."cfg(target_os = \"macos\")".dependencies.core-foundation] - version = "0.9.0" + version = "0.7.0" features = ["mac_os_10_7_support"] diff --git a/src/cargo/debian/patches/relax-deps.patch b/src/cargo/debian/patches/relax-deps.patch index 713a430..2a9bf8d 100644 --- a/src/cargo/debian/patches/relax-deps.patch +++ b/src/cargo/debian/patches/relax-deps.patch @@ -1,11 +1,35 @@ ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -140,7 +140,7 @@ +Index: cargo/Cargo.toml +=================================================================== +--- cargo.orig/Cargo.toml ++++ cargo/Cargo.toml +@@ -75,10 +75,10 @@ features = ["zlib"] + version = "0.4" + + [dependencies.git2] +-version = "0.11.0" ++version = "0.13.11" + + [dependencies.git2-curl] +-version = "0.12.0" ++version = "0.14.1" + + [dependencies.glob] + version = "0.3.0" +@@ -111,7 +111,7 @@ version = "1.2.0" + version = "0.2" + + [dependencies.libgit2-sys] +-version = "0.10.0" ++version = "0.12.13" + + [dependencies.log] + version = "0.4.6" +@@ -194,7 +194,7 @@ deny-warnings = [] + pretty-env-logger = [] + vendored-openssl = ["openssl"] + [target."cfg(target_os = \"macos\")".dependencies.core-foundation] +-version = "0.7.0" ++version = ">= 0.7, < 0.10" + features = ["mac_os_10_7_support"] + [target."cfg(windows)".dependencies.fwdansi] version = "1" - - [dependencies.semver] --version = "0.10" -+version = "0.11" - features = ["serde"] - - [dependencies.serde]