diff options
author | Colin Watson <cjwatson@debian.org> | 2018-12-26 18:24:48 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2018-12-26 18:24:48 +0000 |
commit | a604dd3f234ebbb2823e6af39d58966d4c7d7282 (patch) | |
tree | 898a63e09a6babf9096251358fe7e61e6793611a /debian | |
parent | 7b4b5e65b07886ab75168585b313d225a2471322 (diff) |
Drop obsolete alternate build-dependency on libssl1.0-dev
Closes: #917342
Diffstat (limited to 'debian')
-rwxr-xr-x | debian/adjust-openssl-dependencies | 3 | ||||
-rw-r--r-- | debian/changelog | 2 | ||||
-rw-r--r-- | 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 | |||
@@ -7,9 +7,6 @@ server=debian/openssh-server.substvars | |||
7 | 7 | ||
8 | libssl_version="$(dpkg-query -W libssl-dev 2>/dev/null | cut -f2)" | 8 | libssl_version="$(dpkg-query -W libssl-dev 2>/dev/null | cut -f2)" |
9 | if [ -z "$libssl_version" ]; then | 9 | if [ -z "$libssl_version" ]; then |
10 | libssl_version="$(dpkg-query -W libssl1.0-dev 2>/dev/null | cut -f2)" | ||
11 | fi | ||
12 | if [ -z "$libssl_version" ]; then | ||
13 | echo "Can't find libssl-dev version; leaving dependencies alone." | 10 | echo "Can't find libssl-dev version; leaving dependencies alone." |
14 | exit 0 | 11 | exit 0 |
15 | fi | 12 | fi |
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 | |||
2 | 2 | ||
3 | * Move /etc/ssh/moduli to openssh-server, since it's reasonably large and | 3 | * Move /etc/ssh/moduli to openssh-server, since it's reasonably large and |
4 | only used by sshd (closes: #858050). | 4 | only used by sshd (closes: #858050). |
5 | * Drop obsolete alternate build-dependency on libssl1.0-dev (closes: | ||
6 | #917342). | ||
5 | 7 | ||
6 | -- Colin Watson <cjwatson@debian.org> Thu, 06 Dec 2018 18:16:30 +0000 | 8 | -- Colin Watson <cjwatson@debian.org> Thu, 06 Dec 2018 18:16:30 +0000 |
7 | 9 | ||
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, | |||
13 | libkrb5-dev | heimdal-dev, | 13 | libkrb5-dev | heimdal-dev, |
14 | libpam0g-dev | libpam-dev, | 14 | libpam0g-dev | libpam-dev, |
15 | libselinux1-dev [linux-any], | 15 | libselinux1-dev [linux-any], |
16 | libssl-dev (>= 1.1.0g) | libssl1.0-dev, | 16 | libssl-dev (>= 1.1.0g), |
17 | libsystemd-dev [linux-any], | 17 | libsystemd-dev [linux-any], |
18 | libwrap0-dev | libwrap-dev, | 18 | libwrap0-dev | libwrap-dev, |
19 | pkg-config, | 19 | pkg-config, |