summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog7
-rw-r--r--debian/control3
-rwxr-xr-xdebian/openssh-client.install1
-rwxr-xr-xdebian/openssh-server.install1
-rwxr-xr-xdebian/rules2
5 files changed, 11 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index f0c0623ee..cf0ff261b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
1openssh (1:7.9p1-5) UNRELEASED; urgency=medium
2
3 * Move /etc/ssh/moduli to openssh-server, since it's reasonably large and
4 only used by sshd (closes: #858050).
5
6 -- Colin Watson <cjwatson@debian.org> Thu, 06 Dec 2018 18:16:30 +0000
7
1openssh (1:7.9p1-4) unstable; urgency=medium 8openssh (1:7.9p1-4) unstable; urgency=medium
2 9
3 * Fix Ubuntu detection in debian/rules, since the documentation comment 10 * Fix Ubuntu detection in debian/rules, since the documentation comment
diff --git a/debian/control b/debian/control
index b4abd4a5c..a225752f9 100644
--- a/debian/control
+++ b/debian/control
@@ -88,7 +88,8 @@ Recommends: libpam-systemd,
88Conflicts: sftp, 88Conflicts: sftp,
89 ssh-socks, 89 ssh-socks,
90 ssh2, 90 ssh2,
91Replaces: ssh, 91Replaces: openssh-client (<< 1:7.9p1-5),
92 ssh,
92 ssh-krb5, 93 ssh-krb5,
93Suggests: molly-guard, 94Suggests: molly-guard,
94 monkeysphere, 95 monkeysphere,
diff --git a/debian/openssh-client.install b/debian/openssh-client.install
index 838f98116..310907648 100755
--- a/debian/openssh-client.install
+++ b/debian/openssh-client.install
@@ -1,6 +1,5 @@
1#! /usr/bin/dh-exec 1#! /usr/bin/dh-exec
2 2
3etc/ssh/moduli
4etc/ssh/ssh_config 3etc/ssh/ssh_config
5usr/bin/scp 4usr/bin/scp
6usr/bin/sftp 5usr/bin/sftp
diff --git a/debian/openssh-server.install b/debian/openssh-server.install
index e0cc13cec..5c166fc02 100755
--- a/debian/openssh-server.install
+++ b/debian/openssh-server.install
@@ -1,5 +1,6 @@
1#! /usr/bin/dh-exec 1#! /usr/bin/dh-exec
2 2
3etc/ssh/moduli
3usr/sbin/sshd 4usr/sbin/sshd
4usr/share/man/man5/authorized_keys.5 5usr/share/man/man5/authorized_keys.5
5usr/share/man/man5/sshd_config.5 6usr/share/man/man5/sshd_config.5
diff --git a/debian/rules b/debian/rules
index 94990e023..550306d4f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -178,7 +178,7 @@ endif
178 # Remove version control tags to avoid unnecessary conffile 178 # Remove version control tags to avoid unnecessary conffile
179 # resolution steps for administrators. 179 # resolution steps for administrators.
180 sed -i '/\$$OpenBSD:/d' \ 180 sed -i '/\$$OpenBSD:/d' \
181 debian/openssh-client/etc/ssh/moduli \ 181 debian/openssh-server/etc/ssh/moduli \
182 debian/openssh-client/etc/ssh/ssh_config 182 debian/openssh-client/etc/ssh/ssh_config
183 183
184# We'd like to use dh_install --fail-missing here, but that doesn't work 184# We'd like to use dh_install --fail-missing here, but that doesn't work