[pkg-java] r5344 - trunk/eclipse/debian/patches

[mkoch at alioth.debian.org]

Author: mkoch
Date: 2008-01-08 22:30:10 +0000 (Tue, 08 Jan 2008)
New Revision: 5344

Modified:
   trunk/eclipse/debian/patches/eclipse-jsch-sftpexception.dpatch
Log:
* Updated debian/patches/eclipse-jsch-sftpexception.dpatch for jsch 0.1.36.
* Updated (Build-)Depends on libjsch-java (>= 0.1.36).
* Added JAVA_HOME for icedtea to debian/extra/java_home.


Modified: trunk/eclipse/debian/patches/eclipse-jsch-sftpexception.dpatch
===================================================================
--- trunk/eclipse/debian/patches/eclipse-jsch-sftpexception.dpatch	2008-01-08 22:29:26 UTC (rev 5343)
+++ trunk/eclipse/debian/patches/eclipse-jsch-sftpexception.dpatch	2008-01-08 22:30:10 UTC (rev 5344)
@@ -48,3 +48,18 @@
        }
  
        MessageDialog.openInformation(getShell(),
+--- source-tree/plugins/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/CVSSSH2PreferencePage.java.orig	2008-01-07 09:30:35.000000000 +0100
++++ source-tree/plugins/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/CVSSSH2PreferencePage.java	2008-01-07 09:31:33.000000000 +0100
+@@ -874,7 +874,11 @@
+       channel.connect();
+       ChannelSftp c=(ChannelSftp)channel;
+ 
+-      /* String pwd=*/ c.pwd(); // Read off the channel
++      try{ /* String pwd=*/ c.pwd(); } // Read off the channel
++      catch(SftpException ee){
++	setErrorMessage(ee.getMessage());
++	return;
++      }
+       SftpATTRS attr=null;
+ 
+       try{ attr=c.stat(".ssh"); } //$NON-NLS-1$