summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog4
-rw-r--r--debian/control2
2 files changed, 5 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 79c3141d6..bd1d7c2b6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,10 @@
1openssh (1:7.2p2-7) UNRELEASED; urgency=medium 1openssh (1:7.2p2-7) UNRELEASED; urgency=medium
2 2
3 * Don't stop the ssh-session-cleanup service on upgrade (closes: #832155). 3 * Don't stop the ssh-session-cleanup service on upgrade (closes: #832155).
4 * Recommend libpam-systemd from openssh-server. It's a much better
5 solution than the above for systemd users, but I'm wary of depending on
6 it in case I cause an assortment of exciting dependency problems on
7 upgrade for non-systemd users.
4 8
5 -- Colin Watson <cjwatson@debian.org> Sat, 23 Jul 2016 11:10:11 +0100 9 -- Colin Watson <cjwatson@debian.org> Sat, 23 Jul 2016 11:10:11 +0100
6 10
diff --git a/debian/control b/debian/control
index ae060a5ce..541cb851d 100644
--- a/debian/control
+++ b/debian/control
@@ -75,7 +75,7 @@ Priority: optional
75Architecture: any 75Architecture: any
76Pre-Depends: ${misc:Pre-Depends} 76Pre-Depends: ${misc:Pre-Depends}
77Depends: ${shlibs:Depends}, ${misc:Depends}, libpam-runtime (>= 0.76-14), libpam-modules (>= 0.72-9), adduser (>= 3.9), dpkg (>= 1.9.0), openssh-client (= ${binary:Version}), lsb-base (>= 4.1+Debian3), procps, openssh-sftp-server 77Depends: ${shlibs:Depends}, ${misc:Depends}, libpam-runtime (>= 0.76-14), libpam-modules (>= 0.72-9), adduser (>= 3.9), dpkg (>= 1.9.0), openssh-client (= ${binary:Version}), lsb-base (>= 4.1+Debian3), procps, openssh-sftp-server
78Recommends: xauth, ncurses-term, ${openssh-server:Recommends} 78Recommends: xauth, ncurses-term, libpam-systemd, ${openssh-server:Recommends}
79Conflicts: ssh-socks, ssh2, sftp 79Conflicts: ssh-socks, ssh2, sftp
80Replaces: ssh, ssh-krb5 80Replaces: ssh, ssh-krb5
81Suggests: ssh-askpass, rssh, molly-guard, ufw, monkeysphere 81Suggests: ssh-askpass, rssh, molly-guard, ufw, monkeysphere