Fix debian/adjust-openssl-dependencies to account for preferring libssl1.0-dev.

2 files changed, 11 insertions, 1 deletions

diff --git a/debian/adjust-openssl-dependencies b/debian/adjust-openssl-dependencies
index 9daa9b415..5113ac164 100755
--- a/debian/adjust-openssl-dependencies
+++ b/debian/adjust-openssl-dependencies
@@ -5,7 +5,10 @@
 client=debian/openssh-client.substvars
 server=debian/openssh-server.substvars
 
-libssl_version="$(dpkg-query -W libssl-dev 2>/dev/null | cut -f2)"
+libssl_version="$(dpkg-query -W libssl1.0-dev 2>/dev/null | cut -f2)"
+if [ -z "$libssl_version" ]; then
+        libssl_version="$(dpkg-query -W libssl-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 19b30d970..c40a80c02 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+openssh (1:7.5p1-3) UNRELEASED; urgency=medium
+
+  * Fix debian/adjust-openssl-dependencies to account for preferring
+    libssl1.0-dev.
+
+ -- Colin Watson <cjwatson@debian.org>  Sat, 08 Apr 2017 15:39:13 +0100
+
 openssh (1:7.5p1-2) experimental; urgency=medium
 
   * Add missing header on Linux/s390.