summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2014-03-06 16:18:42 +0000
committerColin Watson <cjwatson@debian.org>2014-03-06 16:18:42 +0000
commit373ca2a0b9ea6a87fef3728b00a31846aab8f9f1 (patch)
tree70d9f004d9b0836a4564632f546534b3bd0144e0
parent33221af34f437ed39ca678cfc8564a87edf09af7 (diff)
Fix Breaks/Replaces versions of openssh-sftp-server on openssh-server (thanks, Axel Beckert).
-rw-r--r--debian/changelog7
-rw-r--r--debian/control4
2 files changed, 9 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 30d30eb17..1f7058d74 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
1openssh (1:6.5p1-6) UNRELEASED; urgency=medium
2
3 * Fix Breaks/Replaces versions of openssh-sftp-server on openssh-server
4 (thanks, Axel Beckert).
5
6 -- Colin Watson <cjwatson@debian.org> Thu, 06 Mar 2014 16:17:59 +0000
7
1openssh (1:6.5p1-5) unstable; urgency=medium 8openssh (1:6.5p1-5) unstable; urgency=medium
2 9
3 [ Colin Watson ] 10 [ Colin Watson ]
diff --git a/debian/control b/debian/control
index 824f34887..80bc4eb8b 100644
--- a/debian/control
+++ b/debian/control
@@ -78,8 +78,8 @@ Priority: optional
78Architecture: any 78Architecture: any
79Depends: ${shlibs:Depends}, ${misc:Depends} 79Depends: ${shlibs:Depends}, ${misc:Depends}
80Recommends: openssh-server | ssh-server 80Recommends: openssh-server | ssh-server
81Breaks: openssh-server (<< 1:6.5p1-4) 81Breaks: openssh-server (<< 1:6.5p1-5)
82Replaces: openssh-server (<< 1:6.5p1-4) 82Replaces: openssh-server (<< 1:6.5p1-5)
83Enhances: openssh-server, ssh-server 83Enhances: openssh-server, ssh-server
84Description: secure shell (SSH) sftp server module, for SFTP access from remote machines 84Description: secure shell (SSH) sftp server module, for SFTP access from remote machines
85 This is the portable version of OpenSSH, a free implementation of 85 This is the portable version of OpenSSH, a free implementation of