summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2003-11-15 15:57:35 +0000
committerColin Watson <cjwatson@debian.org>2003-11-15 15:57:35 +0000
commite1f3fa434155557cf19e4e8fa00c0627e159fbee (patch)
tree6f1fa3c78a01493e1e0567b3287c4e330a534353 /debian
parentac444049e27aa772e57d38b889ceee46e7331a50 (diff)
Depend on dpkg (>= 1.9.0) for start-stop-daemon's --retry option.
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog1
-rw-r--r--debian/control4
2 files changed, 3 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 05fc0c9c0..fc15b5181 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ openssh (1:3.6.1p2-10) UNRELEASED; urgency=low
2 2
3 * Use --retry in init script when restarting rather than sleeping, to make 3 * Use --retry in init script when restarting rather than sleeping, to make
4 sure the old process is dead (thanks, Herbert Xu; closes: #212117). 4 sure the old process is dead (thanks, Herbert Xu; closes: #212117).
5 Depend on dpkg (>= 1.9.0) for start-stop-daemon's --retry option.
5 * Update debconf template translations: 6 * Update debconf template translations:
6 - Brazilian Portuguese (thanks, Andre Luis Lopes; closes: #219844). 7 - Brazilian Portuguese (thanks, Andre Luis Lopes; closes: #219844).
7 - Danish (thanks, Morten Brix Pedersen; closes: #217964). 8 - Danish (thanks, Morten Brix Pedersen; closes: #217964).
diff --git a/debian/control b/debian/control
index d7dc3a533..d3dd23d0a 100644
--- a/debian/control
+++ b/debian/control
@@ -8,9 +8,9 @@ Uploaders: Colin Watson <cjwatson@debian.org>
8 8
9Package: ssh 9Package: ssh
10Architecture: any 10Architecture: any
11Depends: ${shlibs:Depends}, ${debconf-depends}, ${pam-depends}, libpam-modules (>= 0.72-9), adduser (>= 3.9) 11Depends: ${shlibs:Depends}, ${debconf-depends}, ${pam-depends}, libpam-modules (>= 0.72-9), adduser (>= 3.9), dpkg (>= 1.9.0)
12Conflicts: ssh-nonfree (<<2), ssh-socks, ssh2, sftp, rsh-client (<<0.16.1-1) 12Conflicts: ssh-nonfree (<<2), ssh-socks, ssh2, sftp, rsh-client (<<0.16.1-1)
13Suggests: ssh-askpass, xbase-clients, dpkg (>=1.8.3.1), dnsutils 13Suggests: ssh-askpass, xbase-clients, dnsutils
14Provides: rsh-client 14Provides: rsh-client
15Description: Secure rlogin/rsh/rcp replacement (OpenSSH) 15Description: Secure rlogin/rsh/rcp replacement (OpenSSH)
16 This is the portable version of OpenSSH, a free implementation of 16 This is the portable version of OpenSSH, a free implementation of