diff -Nru bzr-upload-1.1.0/debian/changelog bzr-upload-1.1.0/debian/changelog
--- bzr-upload-1.1.0/debian/changelog	2014-01-25 03:52:19.000000000 +0000
+++ bzr-upload-1.1.0/debian/changelog	2014-07-17 00:20:41.000000000 +0000
@@ -1,3 +1,17 @@
+bzr-upload (1.1.0-5) unstable; urgency=medium
+
+  [ Andrew Starr-Bochicchio ]
+  * Fix typo in description (Closes: #745299).
+
+  [ Jelmer Vernooij ]
+  * Team upload.
+  * Add build-conflicts against newer versions of paramiko which no
+    longer support passing in buffer objects. Closes: #750322
+  * Add patch 01_no_paramiko: support running testsuite without
+    paramiko.
+
+ -- Jelmer Vernooij <jelmer@debian.org>  Sun, 20 Apr 2014 14:04:19 -0400
+
 bzr-upload (1.1.0-4) unstable; urgency=medium
 
   * Team upload.
diff -Nru bzr-upload-1.1.0/debian/control bzr-upload-1.1.0/debian/control
--- bzr-upload-1.1.0/debian/control	2014-01-25 03:49:48.000000000 +0000
+++ bzr-upload-1.1.0/debian/control	2014-07-17 00:05:56.000000000 +0000
@@ -3,8 +3,8 @@
 Priority: optional
 Maintainer: Debian Bazaar Maintainers <pkg-bazaar-maint@lists.alioth.debian.org>
 Uploaders: Koichi Akabe <vbkaisetsu@gmail.com>
-Build-Depends-Indep: python-paramiko, python-testtools
-Build-Conflicts: bzr-hg
+Build-Depends-Indep: python-testtools
+Build-Conflicts: bzr-hg, python-paramiko (>= 1.12.0)
 Build-Depends: bzr (<< 2.7.0),
                bzr (>= 2.2~),
                debhelper (>= 9.0.0),
@@ -19,7 +19,8 @@
 
 Package: bzr-upload
 Architecture: all
-Recommends: python-paramiko
+Recommends: python-paramiko (<< 1.12.0)
+Conflicts: python-paramiko (>= 1.12.0)
 Depends: bzr (<< 2.7.0), bzr (>= 2.2~), ${misc:Depends}, ${python:Depends}
 Enhances: bzr
 Description: Bazaar plugin for uploading to web servers
@@ -29,7 +30,7 @@
  Web sites are often hosted on servers where Bazaar can not be installed.
  In other cases, the web site must not give access to its corresponding
  branch (for security reasons for example). Finally, web hosting providers
- often provides only ftp access to upload sites.  This plugin uploads only
+ often provide only ftp access to upload sites.  This plugin uploads only
  the relevant changes since the last upload using the ftp or sftp protocols.
  .
  It adds a "upload" subcommand to bzr.
diff -Nru bzr-upload-1.1.0/debian/patches/01_no_paramiko bzr-upload-1.1.0/debian/patches/01_no_paramiko
--- bzr-upload-1.1.0/debian/patches/01_no_paramiko	1970-01-01 00:00:00.000000000 +0000
+++ bzr-upload-1.1.0/debian/patches/01_no_paramiko	2014-07-17 00:19:15.000000000 +0000
@@ -0,0 +1,51 @@
+Origin: commit, revision id: jelmer@samba.org-20140717001539-0586k2u1i68hp22j
+Author: Jelmer Vernooij <jelmer@samba.org>
+Last-Update: 2014-07-17
+Applied-Upstream: no
+Status: submitted upstream
+X-Bzr-Revision-Id: jelmer@samba.org-20140717001539-0586k2u1i68hp22j
+
+
+=== modified file 'tests/test_upload.py'
+--- old/tests/test_upload.py	2012-03-15 20:53:45 +0000
++++ new/tests/test_upload.py	2014-07-17 00:15:39 +0000
+@@ -33,11 +33,17 @@
+     features,
+     per_branch,
+     per_transport,
+-    stub_sftp,
+     )
++try:
++    import paramiko
++except ImportError:
++    stub_sftp = None
++    sftp = None
++else:
++    from bzrlib.tests import stub_sftp
++    from bzrlib.transport import sftp
+ from bzrlib.transport import (
+     ftp,
+-    sftp,
+     )
+ from bzrlib.plugins.upload import (
+     cmds,
+@@ -50,7 +56,8 @@
+     # Keep only the interesting ones for upload
+     for name, d in basis:
+         t_class = d['transport_class']
+-        if t_class in (ftp.FtpTransport, sftp.SFTPTransport):
++        if (t_class == ftp.FtpTransport or
++            (sftp is not None and t_class == sftp.SFTPTransport)):
+             result.append((name, d))
+     try:
+         import bzrlib.plugins.local_test_server
+@@ -788,7 +795,7 @@
+         self.add_file('hello', 'foo')
+ 
+         remote_branch_url = self.get_url(self.remote_branch_dir)
+-        if self.transport_server is stub_sftp.SFTPHomeDirServer:
++        if stub_sftp is not None and self.transport_server is stub_sftp.SFTPHomeDirServer:
+             # FIXME: Some policy search ends up above the user home directory
+             # and are seen as attemps to escape test isolation
+             raise tests.TestNotApplicable('Escaping test isolation')
+
diff -Nru bzr-upload-1.1.0/debian/patches/series bzr-upload-1.1.0/debian/patches/series
--- bzr-upload-1.1.0/debian/patches/series	1970-01-01 00:00:00.000000000 +0000
+++ bzr-upload-1.1.0/debian/patches/series	2014-07-17 00:17:57.000000000 +0000
@@ -0,0 +1 @@
+01_no_paramiko