Move moduli(5) manual page to openssh-server

This goes with /etc/ssh/moduli; forgotten in 1:7.9p1-5.

4 files changed, 4 insertions, 2 deletions

diff --git a/debian/changelog b/debian/changelog
index 9545f9606..132ef899f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ openssh (1:7.9p1-8) UNRELEASED; urgency=medium
   * Apply upstream patch to request RSA-SHA2 signatures for
     rsa-sha2-{256|512}-cert-v01@openssh.com cert algorithms (closes:
     #923419).
+  * Move moduli(5) manual page to openssh-server to go with /etc/ssh/moduli;
+    forgotten in 1:7.9p1-5.
 
   [ Dominik George ]
   * Correctly handle conffile move to openssh-server (closes: #919344).
diff --git a/debian/control b/debian/control
index 01d0e994f..0e4388429 100644
--- a/debian/control
+++ b/debian/control
@@ -88,7 +88,7 @@ Recommends: default-logind | logind | libpam-systemd,
 Conflicts: sftp,
            ssh-socks,
            ssh2,
-Replaces: openssh-client (<< 1:7.9p1-5),
+Replaces: openssh-client (<< 1:7.9p1-8),
           ssh,
           ssh-krb5,
 Suggests: molly-guard,
diff --git a/debian/openssh-client.install b/debian/openssh-client.install
index 310907648..24376514f 100755
--- a/debian/openssh-client.install
+++ b/debian/openssh-client.install
@@ -17,7 +17,6 @@ usr/share/man/man1/ssh-agent.1
 usr/share/man/man1/ssh-keygen.1
 usr/share/man/man1/ssh-keyscan.1
 usr/share/man/man1/ssh.1
-usr/share/man/man5/moduli.5
 usr/share/man/man5/ssh_config.5
 usr/share/man/man8/ssh-keysign.8
 usr/share/man/man8/ssh-pkcs11-helper.8
diff --git a/debian/openssh-server.install b/debian/openssh-server.install
index 5c166fc02..29e7abc8e 100755
--- a/debian/openssh-server.install
+++ b/debian/openssh-server.install
@@ -3,6 +3,7 @@
 etc/ssh/moduli
 usr/sbin/sshd
 usr/share/man/man5/authorized_keys.5
+usr/share/man/man5/moduli.5
 usr/share/man/man5/sshd_config.5
 usr/share/man/man8/sshd.8