diff options
author | Colin Watson <cjwatson@debian.org> | 2011-04-04 15:53:48 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2011-04-04 15:53:48 +0100 |
commit | db1d7efa461f51dc2880dfecab54f57db327564a (patch) | |
tree | e881ef9c58d33deff78083f61632d65ec0c9ff90 | |
parent | 2d23c2299ec14c5336d1373ff0fce67495202be8 (diff) |
Drop hardcoded dependencies on libssl0.9.8 and libcrypto0.9.8-udeb,
since the required minimum versions are rather old now anyway and
openssl has bumped its SONAME (thanks, Julien Cristau; closes: #620828).
-rw-r--r-- | debian/changelog | 8 | ||||
-rw-r--r-- | debian/control | 8 |
2 files changed, 12 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog index 30185852e..9065c08ca 100644 --- a/debian/changelog +++ b/debian/changelog | |||
@@ -1,3 +1,11 @@ | |||
1 | openssh (1:5.8p1-4) UNRELEASED; urgency=low | ||
2 | |||
3 | * Drop hardcoded dependencies on libssl0.9.8 and libcrypto0.9.8-udeb, | ||
4 | since the required minimum versions are rather old now anyway and | ||
5 | openssl has bumped its SONAME (thanks, Julien Cristau; closes: #620828). | ||
6 | |||
7 | -- Colin Watson <cjwatson@debian.org> Mon, 04 Apr 2011 15:44:29 +0100 | ||
8 | |||
1 | openssh (1:5.8p1-3) unstable; urgency=low | 9 | openssh (1:5.8p1-3) unstable; urgency=low |
2 | 10 | ||
3 | * Correct ssh-keygen instruction in the changelog for 1:5.7p1-1 (thanks, | 11 | * Correct ssh-keygen instruction in the changelog for 1:5.7p1-1 (thanks, |
diff --git a/debian/control b/debian/control index bca234a5f..586a34085 100644 --- a/debian/control +++ b/debian/control | |||
@@ -11,7 +11,7 @@ Vcs-Browser: http://bzr.debian.org/loggerhead/pkg-ssh/openssh/trunk | |||
11 | 11 | ||
12 | Package: openssh-client | 12 | Package: openssh-client |
13 | Architecture: any | 13 | Architecture: any |
14 | Depends: ${shlibs:Depends}, ${misc:Depends}, debconf (>= 1.2.0) | debconf-2.0, adduser (>= 3.10), dpkg (>= 1.7.0), passwd, libssl0.9.8 (>= 0.9.8g-9) | 14 | Depends: ${shlibs:Depends}, ${misc:Depends}, debconf (>= 1.2.0) | debconf-2.0, adduser (>= 3.10), dpkg (>= 1.7.0), passwd |
15 | Recommends: xauth, openssh-blacklist, openssh-blacklist-extra | 15 | Recommends: xauth, openssh-blacklist, openssh-blacklist-extra |
16 | Conflicts: ssh (<< 1:3.8.1p1-9), sftp, rsh-client (<<0.16.1-1), ssh-krb5 (<< 1:4.3p2-7) | 16 | Conflicts: ssh (<< 1:3.8.1p1-9), sftp, rsh-client (<<0.16.1-1), ssh-krb5 (<< 1:4.3p2-7) |
17 | Replaces: ssh, ssh-krb5 | 17 | Replaces: ssh, ssh-krb5 |
@@ -43,7 +43,7 @@ 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), libssl0.9.8 (>= 0.9.8g-9), 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), openssh-blacklist, procps |
47 | Recommends: xauth, openssh-blacklist-extra | 47 | Recommends: xauth, 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 |
@@ -108,7 +108,7 @@ XC-Package-Type: udeb | |||
108 | Section: debian-installer | 108 | Section: debian-installer |
109 | Priority: optional | 109 | Priority: optional |
110 | Architecture: any | 110 | Architecture: any |
111 | Depends: ${shlibs:Depends}, libnss-files-udeb, libcrypto0.9.8-udeb (>= 0.9.8g-9) | 111 | Depends: ${shlibs:Depends}, libnss-files-udeb |
112 | XB-Installer-Menu-Item: 99999 | 112 | XB-Installer-Menu-Item: 99999 |
113 | Description: secure shell client for the Debian installer | 113 | Description: secure shell client for the Debian installer |
114 | This is the portable version of OpenSSH, a free implementation of | 114 | This is the portable version of OpenSSH, a free implementation of |
@@ -122,7 +122,7 @@ XC-Package-Type: udeb | |||
122 | Section: debian-installer | 122 | Section: debian-installer |
123 | Priority: optional | 123 | Priority: optional |
124 | Architecture: any | 124 | Architecture: any |
125 | Depends: ${shlibs:Depends}, libnss-files-udeb, libcrypto0.9.8-udeb (>= 0.9.8g-9) | 125 | Depends: ${shlibs:Depends}, libnss-files-udeb |
126 | Description: secure shell server for the Debian installer | 126 | Description: secure shell server for the Debian installer |
127 | This is the portable version of OpenSSH, a free implementation of | 127 | This is the portable version of OpenSSH, a free implementation of |
128 | the Secure Shell protocol as specified by the IETF secsh working | 128 | the Secure Shell protocol as specified by the IETF secsh working |