summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog2
-rw-r--r--debian/control2
2 files changed, 3 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 69b408900..5c982676d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ openssh (1:4.3p2-11) UNRELEASED; urgency=low
6 as Uploaders. 6 as Uploaders.
7 * Use dpkg-query to fetch conffile md5sums rather than parsing 7 * Use dpkg-query to fetch conffile md5sums rather than parsing
8 /var/lib/dpkg/status directly. 8 /var/lib/dpkg/status directly.
9 * openssh-client Suggests: libpam-ssh (closes: #427840).
10
9 * Apply results of debconf templates and package descriptions review by 11 * Apply results of debconf templates and package descriptions review by
10 debian-l10n-english (closes: #420107). 12 debian-l10n-english (closes: #420107).
11 * debconf template translations: 13 * debconf template translations:
diff --git a/debian/control b/debian/control
index 7de8e19f6..b266750ad 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Architecture: any
11Depends: ${shlibs:Depends}, ${debconf-depends}, adduser (>= 3.10), dpkg (>= 1.7.0), passwd 11Depends: ${shlibs:Depends}, ${debconf-depends}, adduser (>= 3.10), dpkg (>= 1.7.0), passwd
12Conflicts: ssh (<< 1:3.8.1p1-9), sftp, rsh-client (<<0.16.1-1), ssh-krb5 (<< 1:4.3p2-7) 12Conflicts: ssh (<< 1:3.8.1p1-9), sftp, rsh-client (<<0.16.1-1), ssh-krb5 (<< 1:4.3p2-7)
13Replaces: ssh, ssh-krb5 13Replaces: ssh, ssh-krb5
14Suggests: ssh-askpass, xbase-clients 14Suggests: ssh-askpass, xbase-clients, libpam-ssh
15Provides: rsh-client, ssh-client 15Provides: rsh-client, ssh-client
16Description: secure shell client, an rlogin/rsh/rcp replacement 16Description: secure shell client, an rlogin/rsh/rcp replacement
17 This is the portable version of OpenSSH, a free implementation of 17 This is the portable version of OpenSSH, a free implementation of