From a604dd3f234ebbb2823e6af39d58966d4c7d7282 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Wed, 26 Dec 2018 18:24:48 +0000 Subject: Drop obsolete alternate build-dependency on libssl1.0-dev Closes: #917342 --- debian/adjust-openssl-dependencies | 3 --- debian/changelog | 2 ++ debian/control | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/debian/adjust-openssl-dependencies b/debian/adjust-openssl-dependencies index 3c4e5265d..1cd7f2997 100755 --- a/debian/adjust-openssl-dependencies +++ b/debian/adjust-openssl-dependencies @@ -6,9 +6,6 @@ client=debian/openssh-client.substvars server=debian/openssh-server.substvars libssl_version="$(dpkg-query -W libssl-dev 2>/dev/null | cut -f2)" -if [ -z "$libssl_version" ]; then - libssl_version="$(dpkg-query -W libssl1.0-dev 2>/dev/null | cut -f2)" -fi if [ -z "$libssl_version" ]; then echo "Can't find libssl-dev version; leaving dependencies alone." exit 0 diff --git a/debian/changelog b/debian/changelog index cf0ff261b..aee8f7b88 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ openssh (1:7.9p1-5) UNRELEASED; urgency=medium * Move /etc/ssh/moduli to openssh-server, since it's reasonably large and only used by sshd (closes: #858050). + * Drop obsolete alternate build-dependency on libssl1.0-dev (closes: + #917342). -- Colin Watson Thu, 06 Dec 2018 18:16:30 +0000 diff --git a/debian/control b/debian/control index a225752f9..33f2a3837 100644 --- a/debian/control +++ b/debian/control @@ -13,7 +13,7 @@ Build-Depends: autotools-dev, libkrb5-dev | heimdal-dev, libpam0g-dev | libpam-dev, libselinux1-dev [linux-any], - libssl-dev (>= 1.1.0g) | libssl1.0-dev, + libssl-dev (>= 1.1.0g), libsystemd-dev [linux-any], libwrap0-dev | libwrap-dev, pkg-config, -- cgit v1.2.3