[X2Go-Commits] python-paramiko.git - x2go (branch) updated: bc71e90bcb8cd8d270e43bb108f67c7cef485328

[X2Go dev team]

The branch, x2go has been updated
       via  bc71e90bcb8cd8d270e43bb108f67c7cef485328 (commit)
      from  aa89cf6f18b544c1e9ffbb4436a2cbc9aa92b566 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit bc71e90bcb8cd8d270e43bb108f67c7cef485328
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Sep 27 23:45:46 2013 +0200

    move the changes from patch 007 further down, so we do not get conflicts whith every new upstream release

-----------------------------------------------------------------------

Summary of changes:
 debian/patches/007_reintroduce-version-info.patch |   17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

The diff of changes is:
diff --git a/debian/patches/007_reintroduce-version-info.patch b/debian/patches/007_reintroduce-version-info.patch
index 229f774..9b9fedc 100644
--- a/debian/patches/007_reintroduce-version-info.patch
+++ b/debian/patches/007_reintroduce-version-info.patch
@@ -2,11 +2,20 @@ Description: Reintroduce __version_info__ as it breaks mysql-workbench
 Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
 --- a/paramiko/__init__.py
 +++ b/paramiko/__init__.py
-@@ -58,6 +58,7 @@
- 
- __author__ = "Jeff Forcier <jeff at bitprophet.org>"
+@@ -60,7 +60,6 @@
  __version__ = "1.11.0"
-+__version_info__ = tuple([ int(d) for d in __version__.split(".") ])
  __license__ = "GNU Lesser General Public License (LGPL)"
  
+-
+ from transport import SecurityOptions, Transport
+ from client import SSHClient, MissingHostKeyPolicy, AutoAddPolicy, RejectPolicy, WarningPolicy
+ from auth_handler import AuthHandler
+@@ -87,6 +86,8 @@
+ from config import SSHConfig
+ from proxy import ProxyCommand
  
++__version_info__ = tuple([ int(d) for d in __version__.split(".") ])
++
+ # fix module names for epydoc
+ for c in locals().values():
+     if issubclass(type(c), type) or type(c).__name__ == 'classobj':


hooks/post-receive
-- 
python-paramiko.git (Debian package python-paramiko)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "python-paramiko.git" (Debian package python-paramiko).