[netbeans] 13/49: Drop netbeans-extexecution.impl.patch

Markus Koschany apo-guest at moszumanska.debian.org
Sat Dec 26 20:44:48 UTC 2015


This is an automated email from the git hooks/post-receive script.

apo-guest pushed a commit to branch master
in repository netbeans.

commit 2c942b1ede5e5b434fe5c5a482b98daf8f4d6438
Author: Markus Koschany <apo at debian.org>
Date:   Thu Dec 17 01:36:36 2015 +0100

    Drop netbeans-extexecution.impl.patch
---
 debian/patches/netbeans-extexecution.impl.patch | 47 -------------------------
 debian/patches/series                           |  1 -
 2 files changed, 48 deletions(-)

diff --git a/debian/patches/netbeans-extexecution.impl.patch b/debian/patches/netbeans-extexecution.impl.patch
deleted file mode 100644
index 6f1d859..0000000
--- a/debian/patches/netbeans-extexecution.impl.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From: Markus Koschany <apo at debian.org>
-Date: Mon, 8 Jun 2015 22:14:28 +0200
-Subject: netbeans extexecution.impl
-
-We don't build the extexecution.impl module.
-
-Forwarded: not-needed
----
- extexecution.impl/nbproject/project.properties                      | 6 +++---
- .../modules/extexecution/destroy/ProcessTreeDestroyPerformer.java   | 3 +--
- 2 files changed, 4 insertions(+), 5 deletions(-)
-
-diff --git a/extexecution.impl/nbproject/project.properties b/extexecution.impl/nbproject/project.properties
-index a6d628f..c19f099 100644
---- a/extexecution.impl/nbproject/project.properties
-+++ b/extexecution.impl/nbproject/project.properties
-@@ -1,6 +1,6 @@
- is.eager=true
- javac.source=1.6
- javac.compilerargs=-Xlint -Xlint:-serial
--release.external/winp-1.14-patched.jar=modules/ext/winp-1.14-patched.jar
--release.external/libpam4j-1.1.jar=modules/ext/libpam4j-1.1.jar
--release.external/processtreekiller-1.0.2.jar=modules/ext/processtreekiller-1.0.2.jar
-+#release.external/winp-1.14-patched.jar=modules/ext/winp-1.14-patched.jar
-+#release.external/libpam4j-1.1.jar=modules/ext/libpam4j-1.1.jar
-+#release.external/processtreekiller-1.0.2.jar=modules/ext/processtreekiller-1.0.2.jar
-diff --git a/extexecution.impl/src/org/netbeans/modules/extexecution/destroy/ProcessTreeDestroyPerformer.java b/extexecution.impl/src/org/netbeans/modules/extexecution/destroy/ProcessTreeDestroyPerformer.java
-index f610d53..e4141a1 100644
---- a/extexecution.impl/src/org/netbeans/modules/extexecution/destroy/ProcessTreeDestroyPerformer.java
-+++ b/extexecution.impl/src/org/netbeans/modules/extexecution/destroy/ProcessTreeDestroyPerformer.java
-@@ -43,7 +43,6 @@
- package org.netbeans.modules.extexecution.destroy;
- 
- import java.util.Map;
--import org.netbeans.processtreekiller.ProcessTreeKiller;
- import org.netbeans.spi.extexecution.destroy.ProcessDestroyPerformer;
- import org.openide.util.lookup.ServiceProvider;
- 
-@@ -56,7 +55,7 @@ public class ProcessTreeDestroyPerformer implements ProcessDestroyPerformer {
- 
-     @Override
-     public void destroy(Process process, Map<String, String> env) {
--        ProcessTreeKiller.get().kill(process, env);
-+        return;//ProcessTreeKiller.get().kill(process, env);
-     }
- 
- }
diff --git a/debian/patches/series b/debian/patches/series
index 5beca80..b57e023 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,7 +7,6 @@ netbeans-platform-o.n.html.ko4j.patch
 netbeans-platform-windowslauncher.patch
 osgi-update.patch
 netbeans-javacc.patch
-netbeans-extexecution.impl.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



More information about the pkg-java-commits mailing list