From e93504a2d0a549833b9fa4f4046dfe2396467de9 Mon Sep 17 00:00:00 2001 From: "Jeremy T. Bouse" Date: Thu, 28 Aug 2014 22:19:48 -0700 Subject: Include upstream GitHub Pull Request #352 to fix RC bug Bring existing pull request by Jelmer Vernooij 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 Closes: #750517, #755910 --- debian/control | 2 ++ 1 file changed, 2 insertions(+) (limited to 'debian/control') 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 -- cgit v1.2.3