diff --git a/src/openssl-sys/debian/changelog b/src/openssl-sys/debian/changelog index 2502e30..cc913a7 100644 --- a/src/openssl-sys/debian/changelog +++ b/src/openssl-sys/debian/changelog @@ -1,3 +1,11 @@ +rust-openssl-sys (0.9.55-2) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium + + * Team upload. + * Package openssl-sys 0.9.55 from crates.io using debcargo 2.4.2 + * Fix autopkgtest, don't attempt to find removed vendored openssl. + + -- Ximin Luo Tue, 21 Apr 2020 20:52:07 +0100 + rust-openssl-sys (0.9.55-1) unstable; urgency=medium * Team upload. diff --git a/src/openssl-sys/debian/patches/disable-vendor.patch b/src/openssl-sys/debian/patches/disable-vendor.patch index 34c0c62..c0b5d09 100644 --- a/src/openssl-sys/debian/patches/disable-vendor.patch +++ b/src/openssl-sys/debian/patches/disable-vendor.patch @@ -1,6 +1,6 @@ --- a/Cargo.toml +++ b/Cargo.toml -@@ -21,14 +21,11 @@ +@@ -31,14 +31,11 @@ [build-dependencies.cc] version = "1.0" @@ -16,3 +16,31 @@ +openssl-src = [] [target."cfg(target_env = \"msvc\")".build-dependencies.vcpkg] version = "0.2.8" +--- a/build/main.rs ++++ b/build/main.rs +@@ -1,6 +1,6 @@ + extern crate autocfg; + extern crate cc; +-#[cfg(feature = "vendored")] ++#[cfg(feature = "vendored_debian_disabled")] + extern crate openssl_src; + extern crate pkg_config; + #[cfg(target_env = "msvc")] +@@ -14,7 +14,7 @@ + mod cfgs; + + mod find_normal; +-#[cfg(feature = "vendored")] ++#[cfg(feature = "vendored_debian_disabled")] + mod find_vendored; + + enum Version { +@@ -42,7 +42,7 @@ + } + + fn find_openssl(target: &str) -> (PathBuf, PathBuf) { +- #[cfg(feature = "vendored")] ++ #[cfg(feature = "vendored_debian_disabled")] + { + // vendor if the feature is present, unless + // OPENSSL_NO_VENDOR exists and isn't `0` diff --git a/src/rustup-1.12.1/debian/debcargo.toml b/src/rustup-1.12.1/debian/debcargo.toml deleted file mode 100644 index fdbb775..0000000 --- a/src/rustup-1.12.1/debian/debcargo.toml +++ /dev/null @@ -1,2 +0,0 @@ -overlay = "." -uploaders = ["Ximin Luo "] diff --git a/src/rustup-1.21.1/debian/debcargo.toml b/src/rustup-1.21.1/debian/debcargo.toml deleted file mode 100644 index fdbb775..0000000 --- a/src/rustup-1.21.1/debian/debcargo.toml +++ /dev/null @@ -1,2 +0,0 @@ -overlay = "." -uploaders = ["Ximin Luo "]