diff options
Diffstat (limited to 'debian')
-rw-r--r-- | debian/changelog | 7 | ||||
-rw-r--r-- | debian/control | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index ed3bc8031..50c0a05b7 100644 --- a/debian/changelog +++ b/debian/changelog | |||
@@ -1,3 +1,10 @@ | |||
1 | openssh (1:5.8p1-5) UNRELEASED; urgency=low | ||
2 | |||
3 | * Drop openssh-server's dependency on openssh-blacklist to a | ||
4 | recommendation (closes: #622604). | ||
5 | |||
6 | -- Colin Watson <cjwatson@debian.org> Wed, 13 Apr 2011 13:05:43 +0100 | ||
7 | |||
1 | openssh (1:5.8p1-4) unstable; urgency=low | 8 | openssh (1:5.8p1-4) unstable; urgency=low |
2 | 9 | ||
3 | * Drop hardcoded dependencies on libssl0.9.8 and libcrypto0.9.8-udeb, | 10 | * Drop hardcoded dependencies on libssl0.9.8 and libcrypto0.9.8-udeb, |
diff --git a/debian/control b/debian/control index 586a34085..9b28231cb 100644 --- a/debian/control +++ b/debian/control | |||
@@ -43,8 +43,8 @@ Description: secure shell (SSH) client, for secure access to remote machines | |||
43 | Package: openssh-server | 43 | Package: openssh-server |
44 | Priority: optional | 44 | Priority: optional |
45 | Architecture: any | 45 | Architecture: any |
46 | Depends: ${shlibs:Depends}, ${misc:Depends}, debconf (>= 1.2.0) | debconf-2.0, libpam-runtime (>= 0.76-14), libpam-modules (>= 0.72-9), adduser (>= 3.9), dpkg (>= 1.9.0), openssh-client (= ${binary:Version}), lsb-base (>= 3.2-13), openssh-blacklist, procps | 46 | Depends: ${shlibs:Depends}, ${misc:Depends}, debconf (>= 1.2.0) | debconf-2.0, libpam-runtime (>= 0.76-14), libpam-modules (>= 0.72-9), adduser (>= 3.9), dpkg (>= 1.9.0), openssh-client (= ${binary:Version}), lsb-base (>= 3.2-13), procps |
47 | Recommends: xauth, openssh-blacklist-extra | 47 | Recommends: xauth, openssh-blacklist, openssh-blacklist-extra |
48 | Conflicts: ssh (<< 1:3.8.1p1-9), ssh-nonfree (<<2), ssh-socks, ssh2, sftp, rsh-client (<<0.16.1-1), ssh-krb5 (<< 1:4.3p2-7) | 48 | Conflicts: ssh (<< 1:3.8.1p1-9), ssh-nonfree (<<2), ssh-socks, ssh2, sftp, rsh-client (<<0.16.1-1), ssh-krb5 (<< 1:4.3p2-7) |
49 | Replaces: ssh, openssh-client (<< 1:3.8.1p1-11), ssh-krb5 | 49 | Replaces: ssh, openssh-client (<< 1:3.8.1p1-11), ssh-krb5 |
50 | Suggests: ssh-askpass, rssh, molly-guard, ufw | 50 | Suggests: ssh-askpass, rssh, molly-guard, ufw |