diff options
Diffstat (limited to 'debian')
-rw-r--r-- | debian/changelog | 1 | ||||
-rw-r--r-- | debian/tests/control | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 2ce43a7f9..8893f4b2d 100644 --- a/debian/changelog +++ b/debian/changelog | |||
@@ -57,6 +57,7 @@ openssh (1:7.1p1-1) UNRELEASED; urgency=medium | |||
57 | * Change "PermitRootLogin without-password" to the new preferred spelling | 57 | * Change "PermitRootLogin without-password" to the new preferred spelling |
58 | of "PermitRootLogin prohibit-password" in sshd_config, and update | 58 | of "PermitRootLogin prohibit-password" in sshd_config, and update |
59 | documentation to reflect the new upstream default. | 59 | documentation to reflect the new upstream default. |
60 | * Enable conch interoperability tests under autopkgtest. | ||
60 | 61 | ||
61 | -- Colin Watson <cjwatson@debian.org> Sun, 29 Nov 2015 17:32:44 +0000 | 62 | -- Colin Watson <cjwatson@debian.org> Sun, 29 Nov 2015 17:32:44 +0000 |
62 | 63 | ||
diff --git a/debian/tests/control b/debian/tests/control index 1a3070cdd..ab5122f46 100644 --- a/debian/tests/control +++ b/debian/tests/control | |||
@@ -1,3 +1,3 @@ | |||
1 | Tests: regress | 1 | Tests: regress |
2 | Restrictions: needs-root allow-stderr | 2 | Restrictions: needs-root allow-stderr |
3 | Depends: @builddeps@, openssh-client, openssh-server, openssh-sftp-server, sudo | 3 | Depends: @builddeps@, openssh-client, openssh-server, openssh-sftp-server, sudo, python-twisted-conch (>= 1:15.5.0-1) |