This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to branch master in repository netbeans.
commit dad43bad1ff76920b72947c087816fb8891ede2c Author: Markus Koschany <[email protected]> Date: Tue Jun 16 12:36:02 2015 +0200 Drop netbeans-libs.jsch.agentproxy.patch --- debian/patches/netbeans-libs.jsch.agentproxy.patch | 49 ---------------------- debian/patches/series | 1 - 2 files changed, 50 deletions(-) diff --git a/debian/patches/netbeans-libs.jsch.agentproxy.patch b/debian/patches/netbeans-libs.jsch.agentproxy.patch deleted file mode 100644 index aaf3d53..0000000 --- a/debian/patches/netbeans-libs.jsch.agentproxy.patch +++ /dev/null @@ -1,49 +0,0 @@ -From: Markus Koschany <[email protected]> -Date: Mon, 8 Jun 2015 23:14:30 +0200 -Subject: netbeans libs.jsch.agentproxy - -Workaround for Debian bug 788854 - -Forwarded: not-needed ---- - .../netbeans/libs/jsch/agentproxy/ConnectorFactory.java | 14 ++++++-------- - 1 file changed, 6 insertions(+), 8 deletions(-) - -diff --git a/libs.jsch.agentproxy/src/org/netbeans/libs/jsch/agentproxy/ConnectorFactory.java b/libs.jsch.agentproxy/src/org/netbeans/libs/jsch/agentproxy/ConnectorFactory.java -index e728f07..2106309 100644 ---- a/libs.jsch.agentproxy/src/org/netbeans/libs/jsch/agentproxy/ConnectorFactory.java -+++ b/libs.jsch.agentproxy/src/org/netbeans/libs/jsch/agentproxy/ConnectorFactory.java -@@ -43,9 +43,7 @@ package org.netbeans.libs.jsch.agentproxy; - - import com.jcraft.jsch.agentproxy.Connector; - import com.jcraft.jsch.agentproxy.USocketFactory; --import com.jcraft.jsch.agentproxy.connector.PageantConnector; - import com.jcraft.jsch.agentproxy.connector.SSHAgentConnector; --import com.jcraft.jsch.agentproxy.usocket.JNAUSocketFactory; - import java.util.logging.Level; - import java.util.logging.Logger; - -@@ -80,17 +78,17 @@ public class ConnectorFactory { - try { - if ((preferredKind == ConnectorKind.ANY || preferredKind == ConnectorKind.SSH_AGENT) - && SSHAgentConnector.isConnectorAvailable()) { -- USocketFactory usf = new JNAUSocketFactory(); -- con = new SSHAgentConnector(usf); -+ //USocketFactory usf = new JNAUSocketFactory(); -+ //con = new SSHAgentConnector(usf); - } - } catch (Throwable ex) { - LOG.log(Level.FINE, null, ex); - } - try { -- if ((preferredKind == ConnectorKind.ANY || preferredKind == ConnectorKind.PAGEANT) -- && PageantConnector.isConnectorAvailable()) { -- con = new PageantConnector(); -- } -+ // if ((preferredKind == ConnectorKind.ANY || preferredKind == ConnectorKind.PAGEANT) -+ // && PageantConnector.isConnectorAvailable()) { -+ // con = new PageantConnector(); -+ // } - } catch (Throwable ex) { - LOG.log(Level.FINE, null, ex); - } diff --git a/debian/patches/series b/debian/patches/series index 47c9402..2fc5a36 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -12,7 +12,6 @@ db.dataview-setRowFilter-method.patch netbeans-javacc.patch dlight.nativeexecution.patch netbeans-extexecution.impl.patch -netbeans-libs.jsch.agentproxy.patch netbeans-commons-net.patch netbeans-o.apache.tools.ant.module.patch netbeans-wildUpperBound.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/netbeans.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
