summaryrefslogtreecommitdiff
path: root/debian/control
diff options
context:
space:
mode:
authorJeremy T. Bouse <jbouse@debian.org>2014-08-28 22:19:48 -0700
committerJeremy T. Bouse <jbouse@debian.org>2014-08-28 22:19:48 -0700
commite93504a2d0a549833b9fa4f4046dfe2396467de9 (patch)
treeb572d0be7fdb636a203fbecb65b02e50ff386e60 /debian/control
parent4b554501acddcf70d62817e5b8092305a6cd1b34 (diff)
downloadpython-paramiko-e93504a2d0a549833b9fa4f4046dfe2396467de9.tar
python-paramiko-e93504a2d0a549833b9fa4f4046dfe2396467de9.tar.gz
Include upstream GitHub Pull Request #352 to fix RC bug
Bring existing pull request by Jelmer Vernooij <jelmer> that has been submitted upstream but has not been accepted yet in order to work around the critical error. Will remove this patch when either upstream accepts or provides a better fix. Thanks: Jelmer Vernooij <jelmer> Closes: #750517, #755910
Diffstat (limited to 'debian/control')
-rw-r--r--debian/control2
1 files changed, 2 insertions, 0 deletions
diff --git a/debian/control b/debian/control
index 93d22ec..b9a7aaf 100644
--- a/debian/control
+++ b/debian/control
@@ -43,6 +43,7 @@ Depends: python-crypto (>= 2.1.0-2),
${misc:Depends},
${python:Depends}
Provides: ${python:Provides}
+Conflict: python-bzrlib (<< 2.6.0)
Description: Make ssh v2 connections with Python (Python 2)
This is a library for making SSH2 connections (client or server).
Emphasis is on using SSH2 as an alternative to SSL for making secure
@@ -58,6 +59,7 @@ Depends: python3-crypto (>= 2.1.0-2),
${misc:Depends},
${python3:Depends}
Provides: ${python3:Provides}
+Conflict: python-bzrlib (<< 2.6.0)
Description: Make ssh v2 connections with Python (Python 3)
This is a library for making SSH2 connections (client or server).
Emphasis is on using SSH2 as an alternative to SSL for making secure