From 50a7f434b3dbf64265ba8ba28b49ef01e346fb8a Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Sat, 8 Apr 2017 15:41:08 +0100 Subject: Adjust OpenSSL dependencies for openssh-client-ssh1 too. --- debian/adjust-openssl-dependencies | 2 ++ debian/changelog | 1 + 2 files changed, 3 insertions(+) diff --git a/debian/adjust-openssl-dependencies b/debian/adjust-openssl-dependencies index 5113ac164..b9799c410 100755 --- a/debian/adjust-openssl-dependencies +++ b/debian/adjust-openssl-dependencies @@ -3,6 +3,7 @@ # Must be run after dpkg-shlibdeps. client=debian/openssh-client.substvars +client_ssh1=debian/openssh-client-ssh1.substvars server=debian/openssh-server.substvars libssl_version="$(dpkg-query -W libssl1.0-dev 2>/dev/null | cut -f2)" @@ -19,6 +20,7 @@ libssl_package="$(sed -n 's/.*[= ]\(libssl[0-9][a-z0-9+.-]*\).*/\1/p' "$client") if [ "$libssl_package" ]; then new_dep="$libssl_package (>= $libssl_version)" sed -i "/^shlibs:Depends=/s/\$/, $new_dep/" "$client" + sed -i "/^shlibs:Depends=/s/\$/, $new_dep/" "$client_ssh1" sed -i "/^shlibs:Depends=/s/\$/, $new_dep/" "$server" fi diff --git a/debian/changelog b/debian/changelog index c40a80c02..ee74a80d5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ openssh (1:7.5p1-3) UNRELEASED; urgency=medium * Fix debian/adjust-openssl-dependencies to account for preferring libssl1.0-dev. + * Adjust OpenSSL dependencies for openssh-client-ssh1 too. -- Colin Watson Sat, 08 Apr 2017 15:39:13 +0100 -- cgit v1.2.3