diff --git a/src/git2/debian/changelog b/src/git2/debian/changelog index 2d6b07d..ef90456 100644 --- a/src/git2/debian/changelog +++ b/src/git2/debian/changelog @@ -1,9 +1,15 @@ rust-git2 (0.13.11-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium + * Package git2 0.13.11 from crates.io using debcargo 2.4.3 + * Drop the zlib-ng-compat feature, the ftpmasters are rejecting new + rust feature packages at the moment and the zlib-ng option in + libz-sys seems to be broken in Debian anyway (see bug 972361) + + [ Ximin Luo ] * Team upload. * Package git2 0.13.11 from crates.io using debcargo 2.4.3 - -- Ximin Luo Thu, 01 Oct 2020 21:52:11 +0100 + -- Peter Michael Green Mon, 07 Dec 2020 01:44:19 +0000 rust-git2 (0.11.0-1) unstable; urgency=medium diff --git a/src/git2/debian/patches/remove-zlib-ng-compat.patch b/src/git2/debian/patches/remove-zlib-ng-compat.patch new file mode 100644 index 0000000..a0b1925 --- /dev/null +++ b/src/git2/debian/patches/remove-zlib-ng-compat.patch @@ -0,0 +1,12 @@ +Index: git2/Cargo.toml +=================================================================== +--- git2.orig/Cargo.toml ++++ git2/Cargo.toml +@@ -54,7 +54,6 @@ https = ["libgit2-sys/https", "openssl-s + ssh = ["libgit2-sys/ssh"] + ssh_key_from_memory = ["libgit2-sys/ssh_key_from_memory"] + unstable = [] +-zlib-ng-compat = ["libgit2-sys/zlib-ng-compat"] + [target."cfg(all(unix, not(target_os = \"macos\")))".dependencies.openssl-probe] + version = "0.1" + optional = true diff --git a/src/git2/debian/patches/series b/src/git2/debian/patches/series index 1c3e74a..06473fa 100644 --- a/src/git2/debian/patches/series +++ b/src/git2/debian/patches/series @@ -1 +1,2 @@ disable-vendor.patch +remove-zlib-ng-compat.patch