aboutsummaryrefslogtreecommitdiff
path: root/debian/control
diff options
context:
space:
mode:
authorJeremy T. Bouse <jbouse@debian.org>2014-08-28 22:23:27 -0700
committerJeremy T. Bouse <jbouse@debian.org>2014-08-28 22:23:27 -0700
commit229e1d9cc129f7d9f01dbf946c3dcd6cb6c0ed14 (patch)
tree1d10757cec5954e00da2103e0fac28926aa8aaed /debian/control
parent87432e7ba4c5605f96ebf90de68b5a1d39193004 (diff)
downloadpython-paramiko-229e1d9cc129f7d9f01dbf946c3dcd6cb6c0ed14.tar
python-paramiko-229e1d9cc129f7d9f01dbf946c3dcd6cb6c0ed14.tar.gz
Revert "Include upstream GitHub Pull Request #352 to fix RC bug"
This reverts commit 8f1f5633eb2c2cdaec7691021f6d495772459448.
Diffstat (limited to 'debian/control')
-rw-r--r--debian/control2
1 files changed, 0 insertions, 2 deletions
diff --git a/debian/control b/debian/control
index b9a7aaf..93d22ec 100644
--- a/debian/control
+++ b/debian/control
@@ -43,7 +43,6 @@ 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
@@ -59,7 +58,6 @@ 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