summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog1
-rw-r--r--debian/control2
2 files changed, 2 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 64f713cf8..783e117fc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
1openssh (1:4.3p2-6) UNRELEASED; urgency=low 1openssh (1:4.3p2-6) UNRELEASED; urgency=low
2 2
3 * Acknowledge NMU (thanks, Manoj; closes: #394795). 3 * Acknowledge NMU (thanks, Manoj; closes: #394795).
4 * openssh-server Suggests: molly-guard (closes: #395473).
4 5
5 -- Colin Watson <cjwatson@debian.org> Fri, 27 Oct 2006 11:43:27 +0100 6 -- Colin Watson <cjwatson@debian.org> Fri, 27 Oct 2006 11:43:27 +0100
6 7
diff --git a/debian/control b/debian/control
index b95d1f759..adfeca226 100644
--- a/debian/control
+++ b/debian/control
@@ -41,7 +41,7 @@ Architecture: any
41Depends: ${shlibs:Depends}, ${debconf-depends}, ${pam-depends}, libpam-modules (>= 0.72-9), adduser (>= 3.9), dpkg (>= 1.9.0), openssh-client (= ${Source-Version}) 41Depends: ${shlibs:Depends}, ${debconf-depends}, ${pam-depends}, libpam-modules (>= 0.72-9), adduser (>= 3.9), dpkg (>= 1.9.0), openssh-client (= ${Source-Version})
42Conflicts: ssh (<< 1:3.8.1p1-9), ssh-nonfree (<<2), ssh-socks, ssh2, sftp, rsh-client (<<0.16.1-1), ssh-krb5 42Conflicts: ssh (<< 1:3.8.1p1-9), ssh-nonfree (<<2), ssh-socks, ssh2, sftp, rsh-client (<<0.16.1-1), ssh-krb5
43Replaces: ssh (<< 1:3.8.1p1-9), openssh-client (<< 1:3.8.1p1-11), ssh-krb5 43Replaces: ssh (<< 1:3.8.1p1-9), openssh-client (<< 1:3.8.1p1-11), ssh-krb5
44Suggests: ssh-askpass, xbase-clients, rssh 44Suggests: ssh-askpass, xbase-clients, rssh, molly-guard
45Provides: ssh-server 45Provides: ssh-server
46Description: Secure shell server, an rshd replacement 46Description: Secure shell server, an rshd replacement
47 This is the portable version of OpenSSH, a free implementation of 47 This is the portable version of OpenSSH, a free implementation of