diff options
-rw-r--r-- | debian/changelog | 2 | ||||
-rw-r--r-- | debian/control | 2 | ||||
-rwxr-xr-x | debian/openssh-client.install | 1 | ||||
-rwxr-xr-x | debian/openssh-server.install | 1 |
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 | |||
7 | * Apply upstream patch to request RSA-SHA2 signatures for | 7 | * Apply upstream patch to request RSA-SHA2 signatures for |
8 | rsa-sha2-{256|512}-cert-v01@openssh.com cert algorithms (closes: | 8 | rsa-sha2-{256|512}-cert-v01@openssh.com cert algorithms (closes: |
9 | #923419). | 9 | #923419). |
10 | * Move moduli(5) manual page to openssh-server to go with /etc/ssh/moduli; | ||
11 | forgotten in 1:7.9p1-5. | ||
10 | 12 | ||
11 | [ Dominik George ] | 13 | [ Dominik George ] |
12 | * Correctly handle conffile move to openssh-server (closes: #919344). | 14 | * 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, | |||
88 | Conflicts: sftp, | 88 | Conflicts: sftp, |
89 | ssh-socks, | 89 | ssh-socks, |
90 | ssh2, | 90 | ssh2, |
91 | Replaces: openssh-client (<< 1:7.9p1-5), | 91 | Replaces: openssh-client (<< 1:7.9p1-8), |
92 | ssh, | 92 | ssh, |
93 | ssh-krb5, | 93 | ssh-krb5, |
94 | Suggests: molly-guard, | 94 | 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 | |||
17 | usr/share/man/man1/ssh-keygen.1 | 17 | usr/share/man/man1/ssh-keygen.1 |
18 | usr/share/man/man1/ssh-keyscan.1 | 18 | usr/share/man/man1/ssh-keyscan.1 |
19 | usr/share/man/man1/ssh.1 | 19 | usr/share/man/man1/ssh.1 |
20 | usr/share/man/man5/moduli.5 | ||
21 | usr/share/man/man5/ssh_config.5 | 20 | usr/share/man/man5/ssh_config.5 |
22 | usr/share/man/man8/ssh-keysign.8 | 21 | usr/share/man/man8/ssh-keysign.8 |
23 | usr/share/man/man8/ssh-pkcs11-helper.8 | 22 | 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 @@ | |||
3 | etc/ssh/moduli | 3 | etc/ssh/moduli |
4 | usr/sbin/sshd | 4 | usr/sbin/sshd |
5 | usr/share/man/man5/authorized_keys.5 | 5 | usr/share/man/man5/authorized_keys.5 |
6 | usr/share/man/man5/moduli.5 | ||
6 | usr/share/man/man5/sshd_config.5 | 7 | usr/share/man/man5/sshd_config.5 |
7 | usr/share/man/man8/sshd.8 | 8 | usr/share/man/man8/sshd.8 |
8 | 9 | ||