Move ssh-sk-helper into openssh-client

... rather than shipping it in a separate package.  The extra library
dependencies are pretty small, so it doesn't seem worth bloating the
Packages file.

Suggested by Bastian Blank.

5 files changed, 17 insertions, 20 deletions

diff --git a/debian/changelog b/debian/changelog
index 0ccbe5ad8..94b68540f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+openssh (1:8.2p1-2) UNRELEASED; urgency=medium
+
+  * Move ssh-sk-helper into openssh-client rather than shipping it in a
+    separate package.  The extra library dependencies are pretty small, so
+    it doesn't seem worth bloating the Packages file.  Suggested by Bastian
+    Blank.
+
+ -- Colin Watson <cjwatson@debian.org>  Sun, 23 Feb 2020 10:40:19 +0000
+
 openssh (1:8.2p1-1) unstable; urgency=medium
 
   * New upstream release (https://www.openssh.com/txt/release-8.2, closes:
diff --git a/debian/control b/debian/control
index f71033f18..98ee0189a 100644
--- a/debian/control
+++ b/debian/control
@@ -35,10 +35,11 @@ Depends: adduser (>= 3.10),
          passwd,
          ${misc:Depends},
          ${shlibs:Depends},
-Recommends: openssh-sk-helper,
-            xauth,
+Recommends: xauth,
 Conflicts: sftp,
-Replaces: ssh,
+Breaks: openssh-sk-helper
+Replaces: openssh-sk-helper,
+          ssh,
           ssh-krb5,
 Suggests: keychain,
           libpam-ssh,
@@ -159,23 +160,12 @@ Description: secure shell (SSH) sftp server module, for SFTP access from remote
  Newer versions of the draft will not be supported, though some features
  are individually implemented as extensions.
 
-Package: openssh-sk-helper
-Priority: optional
-Architecture: any
-Depends: ${misc:Depends},
-         ${shlibs:Depends}
-Multi-Arch: foreign
-Description: OpenSSH helper for FIDO authenticator support
- This package provides ssh-sk-helper, which is used by ssh-agent to access
- SSH keys provided by a FIDO authenticator for second-factor authentication.
-
 Package: openssh-tests
 Priority: optional
 Architecture: any
 Depends: openssh-client (= ${binary:Version}),
          openssh-server (= ${binary:Version}),
          openssh-sftp-server (= ${binary:Version}),
-         openssh-sk-helper (= ${binary:Version}),
          openssl,
          putty-tools (>= 0.67-2),
          python3-twisted,
diff --git a/debian/openssh-client.install b/debian/openssh-client.install
index 24376514f..f6dad4805 100755
--- a/debian/openssh-client.install
+++ b/debian/openssh-client.install
@@ -10,6 +10,7 @@ usr/bin/ssh-keygen
 usr/bin/ssh-keyscan
 usr/lib/openssh/ssh-keysign
 usr/lib/openssh/ssh-pkcs11-helper
+[linux-any] usr/lib/openssh/ssh-sk-helper
 usr/share/man/man1/scp.1
 usr/share/man/man1/sftp.1
 usr/share/man/man1/ssh-add.1
@@ -20,6 +21,7 @@ usr/share/man/man1/ssh.1
 usr/share/man/man5/ssh_config.5
 usr/share/man/man8/ssh-keysign.8
 usr/share/man/man8/ssh-pkcs11-helper.8
+[linux-any] usr/share/man/man8/ssh-sk-helper.8
 
 contrib/ssh-copy-id usr/bin
 debian/ssh-argv0 usr/bin
diff --git a/debian/openssh-sk-helper.install b/debian/openssh-sk-helper.install
deleted file mode 100644
index 65fc98e66..000000000
--- a/debian/openssh-sk-helper.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/openssh/ssh-sk-helper
-usr/share/man/man8/ssh-sk-helper.8
diff --git a/debian/rules b/debian/rules
index b4dbec715..73a53c309 100755
--- a/debian/rules
+++ b/debian/rules
@@ -185,10 +185,8 @@ override_dh_install-indep:
         dh_install
 
 override_dh_installdocs:
-        dh_installdocs \
-                -Nopenssh-server -Nopenssh-sftp-server -Nopenssh-sk-helper
-        dh_installdocs \
-                -popenssh-server -popenssh-sftp-server -popenssh-sk-helper \
+        dh_installdocs -Nopenssh-server -Nopenssh-sftp-server
+        dh_installdocs -popenssh-server -popenssh-sftp-server \
                 --link-doc=openssh-client
         # Avoid breaking dh_installexamples later.
         mkdir -p debian/openssh-server/usr/share/doc/openssh-client