From 4eb0b9ac3e4c9987ac17eba84e79074da7449385 Mon Sep 17 00:00:00 2001
From: Robey Pointer <robey@lag.net>
Date: Sat, 11 Mar 2006 20:29:05 -0800
Subject: [PATCH] [project @ robey@lag.net-20060312042905-752c324bdc1ac2cf]
 bump version to 1.5.4

---
 Makefile              |  4 +++-
 README                | 12 ++++++++++--
 paramiko/__init__.py  |  8 ++++----
 paramiko/transport.py |  2 +-
 setup.py              |  4 ++--
 5 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index 176e7bc..05e59c2 100644
--- a/Makefile
+++ b/Makefile
@@ -17,10 +17,12 @@
 # paras (2oct05) - 1.5
 # quilava (31oct05) - 1.5.1
 # rhydon (04dec05) - 1.5.2
-# squirtle (19feb05) - 1.5.3
+# squirtle (19feb06) - 1.5.3
+# tentacool (11mar06) - 1.5.4
 
 release:
 	python ./setup.py sdist --formats=zip
+	python ./setup.py bdist_egg --formats=zip
 
 docs: always
 	epydoc -o docs/ paramiko
diff --git a/README b/README
index 439571a..8132c17 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
-paramiko 1.5.3
-"squirtle" release, 19 feb 2006
+paramiko 1.5.4
+"tentacool" release, 11 mar 2006
 
 Copyright (c) 2003-2006 Robey Pointer <robey@lag.net>
 
@@ -141,6 +141,14 @@ the best and easiest examples of how to use the SFTP class.
 
 highlights of what's new in each release:
 
+v1.5.4 TENTACOOL
+* fixed HostKeys to more correctly emulate a python dict
+* fixed a bug where file read buffering was too aggressive
+* improved prefetching so that out-of-order reads still use the prefetch
+  buffer
+* added experimental SFTPFile.readv() call
+* more unit tests
+
 v1.5.3 SQUIRTLE
 * a few performance enhancements
 * added HostKeys, for dealing with openssh style "known_hosts" files, and
diff --git a/paramiko/__init__.py b/paramiko/__init__.py
index 13102dd..26ee760 100644
--- a/paramiko/__init__.py
+++ b/paramiko/__init__.py
@@ -46,7 +46,7 @@ released under the GNU Lesser General Public License (LGPL).
 
 Website: U{http://www.lag.net/paramiko/}
 
-@version: 1.5.3 (squirtle)
+@version: 1.5.4 (tentacool)
 @author: Robey Pointer
 @contact: robey@lag.net
 @license: GNU Lesser General Public License (LGPL)
@@ -59,9 +59,9 @@ if sys.version_info < (2, 2):
 
 
 __author__ = "Robey Pointer <robey@lag.net>"
-__date__ = "19 Feb 2005"
-__version__ = "1.5.3 (squirtle)"
-__version_info__ = (1, 5, 3)
+__date__ = "11 Mar 2005"
+__version__ = "1.5.4 (tentacool)"
+__version_info__ = (1, 5, 4)
 __license__ = "GNU Lesser General Public License (LGPL)"
 
 
diff --git a/paramiko/transport.py b/paramiko/transport.py
index 1665154..5905178 100644
--- a/paramiko/transport.py
+++ b/paramiko/transport.py
@@ -149,7 +149,7 @@ class Transport (threading.Thread):
     """
 
     _PROTO_ID = '2.0'
-    _CLIENT_ID = 'paramiko_1.5.2'
+    _CLIENT_ID = 'paramiko_1.5.4'
 
     _preferred_ciphers = ( 'aes128-cbc', 'blowfish-cbc', 'aes256-cbc', '3des-cbc' )
     _preferred_macs = ( 'hmac-sha1', 'hmac-md5', 'hmac-sha1-96', 'hmac-md5-96' )
diff --git a/setup.py b/setup.py
index 9779054..3d6d315 100644
--- a/setup.py
+++ b/setup.py
@@ -42,13 +42,13 @@ except ImportError:
     kw = {}
 
 setup(name = "paramiko",
-      version = "1.5.3",
+      version = "1.5.4",
       description = "SSH2 protocol library",
       author = "Robey Pointer",
       author_email = "robey@lag.net",
       url = "http://www.lag.net/paramiko/",
       packages = [ 'paramiko' ],
-      download_url = 'http://www.lag.net/paramiko/download/paramiko-1.5.3.zip',
+      download_url = 'http://www.lag.net/paramiko/download/paramiko-1.5.4.zip',
       license = 'LGPL',
       platforms = 'Posix; MacOS X; Windows',
       classifiers = [ 'Development Status :: 5 - Production/Stable',