From 65883e673b6c5d9d287aa496c97659b87e21411d Mon Sep 17 00:00:00 2001
From: Robey Pointer <robey@lag.net>
Date: Sun, 2 Oct 2005 20:08:39 +0000
Subject: [PATCH] [project @
 Arch-1:robey@lag.net--2005-master-shake%paramiko--dev--1--patch-62] readme
 comments, bump version to 1.5 paras

---
 Makefile              | 1 +
 README                | 4 ++--
 paramiko/__init__.py  | 6 +++---
 paramiko/transport.py | 2 +-
 setup.py              | 4 ++--
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index eb13907..f939d00 100644
--- a/Makefile
+++ b/Makefile
@@ -14,6 +14,7 @@
 # marowak (9apr05) - 1.3
 # nidoran (28jun05) - 1.3.1
 # oddish (17jul05) - 1.4
+# paras (2oct05) - 1.5
 
 release:
 	python ./setup.py sdist --formats=zip
diff --git a/README b/README
index 0dbff4a..b2fc4ea 100644
--- a/README
+++ b/README
@@ -134,7 +134,7 @@ the best and easiest examples of how to use the SFTP class.
 
 highlights of what's new in each release:
 
-v1.5 P...
+v1.5 PARAS
 * added support for "keyboard-interactive" authentication
 * added mode (on by default) where password authentication will try to
   fallback to "keyboard-interactive" if it's supported
@@ -269,7 +269,7 @@ v0.9 FEAROW
     - basically, just don't wait synchronously for server responses.  queue
     up "expected" responses and wait for them on close().
 * SFTP implicit file locking?
-* server-side keyboard-interactive
+* ChannelException like the java version has
 
 * ctr forms of ciphers are missing (blowfish-ctr, aes128-ctr, aes256-ctr)
 * SFTP url parsing function to return (user, pass, host, port, path)
diff --git a/paramiko/__init__.py b/paramiko/__init__.py
index 6e3190e..dec4779 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.4 (oddish)
+@version: 1.5 (paras)
 @author: Robey Pointer
 @contact: robey@lag.net
 @license: GNU Lesser General Public License (LGPL)
@@ -59,8 +59,8 @@ if sys.version_info < (2, 2):
 
 
 __author__ = "Robey Pointer <robey@lag.net>"
-__date__ = "18 Jul 2005"
-__version__ = "1.4 (oddish)"
+__date__ = "02 Oct 2005"
+__version__ = "1.5 (paras)"
 __license__ = "GNU Lesser General Public License (LGPL)"
 
 
diff --git a/paramiko/transport.py b/paramiko/transport.py
index a74d56e..6a8cb2b 100644
--- a/paramiko/transport.py
+++ b/paramiko/transport.py
@@ -134,7 +134,7 @@ class Transport (threading.Thread):
     """
 
     _PROTO_ID = '2.0'
-    _CLIENT_ID = 'paramiko_1.4'
+    _CLIENT_ID = 'paramiko_1.5'
 
     _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 1225b70..9daf85e 100644
--- a/setup.py
+++ b/setup.py
@@ -30,13 +30,13 @@ Required packages:
 '''
 
 setup(name = "paramiko",
-      version = "1.4",
+      version = "1.5",
       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.4.zip',
+      download_url = 'http://www.lag.net/paramiko/download/paramiko-1.5.zip',
       license = 'LGPL',
       platforms = 'Posix; MacOS X; Windows',
       classifiers = [ 'Development Status :: 5 - Production/Stable',