diff options
Diffstat (limited to 'debian/changelog')
-rw-r--r-- | debian/changelog | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 3bf40137a..c1a01a636 100644 --- a/debian/changelog +++ b/debian/changelog | |||
@@ -1,3 +1,10 @@ | |||
1 | openssh (1:4.1p1-4) UNRELEASED; urgency=low | ||
2 | |||
3 | * openssh-client and openssh-server conflict with ssh-krb5, as ssh-krb5 | ||
4 | only conflicts with ssh (closes: #312475). | ||
5 | |||
6 | -- Colin Watson <cjwatson@debian.org> Wed, 8 Jun 2005 12:11:25 +0100 | ||
7 | |||
1 | openssh (1:4.1p1-3) unstable; urgency=low | 8 | openssh (1:4.1p1-3) unstable; urgency=low |
2 | 9 | ||
3 | * Upload to unstable. | 10 | * Upload to unstable. |