r58151 - in /branches/upstream/libnet-ssh2-perl/current: Changes META.yml SSH2.xs lib/Net/SSH2.pm

[carnil-guest at users.alioth.debian.org]

Author: carnil-guest
Date: Thu May 20 17:31:20 2010
New Revision: 58151

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=58151
Log:
[svn-upgrade] Integrating new upstream version, libnet-ssh2-perl (0.30)

Modified:
    branches/upstream/libnet-ssh2-perl/current/Changes
    branches/upstream/libnet-ssh2-perl/current/META.yml
    branches/upstream/libnet-ssh2-perl/current/SSH2.xs
    branches/upstream/libnet-ssh2-perl/current/lib/Net/SSH2.pm

Modified: branches/upstream/libnet-ssh2-perl/current/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libnet-ssh2-perl/current/Changes?rev=58151&op=diff
==============================================================================
--- branches/upstream/libnet-ssh2-perl/current/Changes (original)
+++ branches/upstream/libnet-ssh2-perl/current/Changes Thu May 20 17:31:20 2010
@@ -1,4 +1,8 @@
 Revision history for Perl extension Net::SSH2.
+
+0.30  2010-05-20 10:43:14
+        - rename symbol libssh2_error to xs_libssh2_error to avoid symbol
+          clashes (sisyphus)
 
 0.29  2010-04-14 20:25:37
         - fix splice warning when connecting with a socket handle (RT#56592)

Modified: branches/upstream/libnet-ssh2-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libnet-ssh2-perl/current/META.yml?rev=58151&op=diff
==============================================================================
--- branches/upstream/libnet-ssh2-perl/current/META.yml (original)
+++ branches/upstream/libnet-ssh2-perl/current/META.yml Thu May 20 17:31:20 2010
@@ -21,7 +21,7 @@
 provides:
   Net::SSH2:
     file: lib/Net/SSH2.pm
-    version: 0.29
+    version: 0.30
   Net::SSH2::Channel:
     file: lib/Net/SSH2/Channel.pm
   Net::SSH2::Dir:
@@ -39,4 +39,4 @@
 resources:
   license: http://dev.perl.org/licenses/
   repository: git://github.com/rkitover/net-ssh2.git
-version: 0.29
+version: 0.30

Modified: branches/upstream/libnet-ssh2-perl/current/SSH2.xs
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libnet-ssh2-perl/current/SSH2.xs?rev=58151&op=diff
==============================================================================
--- branches/upstream/libnet-ssh2-perl/current/SSH2.xs (original)
+++ branches/upstream/libnet-ssh2-perl/current/SSH2.xs Thu May 20 17:31:20 2010
@@ -25,7 +25,7 @@
 #endif  /* LIBSSH2_ERROR_NONE */
 
 /* LIBSSH2_ERROR_* values; from 0 continuing negative */
-const char* libssh2_error[] = {
+const char* xs_libssh2_error[] = {
     "NONE",
     "SOCKET_NONE",
     "BANNER_NONE",
@@ -634,8 +634,8 @@
         EXTEND(SP, 3);
         ST(0) = sv_2mortal(newSViv(errcode));
         if (errcode < 0) {
-            code = (-errcode < countof(libssh2_error)) ? 
-             newSVpvf("LIBSSH2_ERROR_%s", libssh2_error[-errcode]) :
+            code = (-errcode < countof(xs_libssh2_error)) ? 
+             newSVpvf("LIBSSH2_ERROR_%s", xs_libssh2_error[-errcode]) :
              newSVpvf("LIBSSH2_ERROR_UNKNOWN(%d)", errcode);
         } else if(errcode > 0)
             code = newSVpv(Strerror(errcode), 0);

Modified: branches/upstream/libnet-ssh2-perl/current/lib/Net/SSH2.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libnet-ssh2-perl/current/lib/Net/SSH2.pm?rev=58151&op=diff
==============================================================================
--- branches/upstream/libnet-ssh2-perl/current/lib/Net/SSH2.pm (original)
+++ branches/upstream/libnet-ssh2-perl/current/lib/Net/SSH2.pm Thu May 20 17:31:20 2010
@@ -188,7 +188,7 @@
 
 our @EXPORT_OK = @{$EXPORT_TAGS{all}};
 
-our $VERSION = '0.29';
+our $VERSION = '0.30';
 $VERSION = eval $VERSION;
 
 # methods