This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to branch master in repository netbeans.
commit fa494e4c8c6976c4bdcb141aac1af62131bb8914 Author: Markus Koschany <[email protected]> Date: Mon Dec 28 22:21:09 2015 +0100 Improve netbeans-extexecution.impl.patch and netbeans-svnclient.patch Try to prevent FileNotFoundExceptions or ZipException at runtime. --- debian/patches/netbeans-extexecution.impl.patch | 25 ++++++++++++++++++++++++- debian/patches/netbeans-svnclient.patch | 4 ++-- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/debian/patches/netbeans-extexecution.impl.patch b/debian/patches/netbeans-extexecution.impl.patch index ebf6a6e..31931ff 100644 --- a/debian/patches/netbeans-extexecution.impl.patch +++ b/debian/patches/netbeans-extexecution.impl.patch @@ -4,8 +4,9 @@ Subject: netbeans extexecution.impl --- extexecution.process/nbproject/project.properties | 6 +++--- + extexecution.process/nbproject/project.xml | 4 ++-- .../org/netbeans/modules/extexecution/process/ProcessesImpl.java | 3 +-- - 2 files changed, 4 insertions(+), 5 deletions(-) + 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/extexecution.process/nbproject/project.properties b/extexecution.process/nbproject/project.properties index 4d9b43c..d5be2ba 100644 @@ -21,6 +22,28 @@ index 4d9b43c..d5be2ba 100644 +#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.5.jar=modules/ext/processtreekiller-1.0.5.jar +diff --git a/extexecution.process/nbproject/project.xml b/extexecution.process/nbproject/project.xml +index 36199b1..13e0001 100644 +--- a/extexecution.process/nbproject/project.xml ++++ b/extexecution.process/nbproject/project.xml +@@ -47,7 +47,7 @@ + </dependency> + </module-dependencies> + <public-packages/> +- <class-path-extension> ++ <!--<class-path-extension> + <runtime-relative-path>ext/winp-1.14-patched.jar</runtime-relative-path> + <binary-origin>external/winp-1.14-patched.jar</binary-origin> + </class-path-extension> +@@ -58,7 +58,7 @@ + <class-path-extension> + <runtime-relative-path>ext/processtreekiller-1.0.5.jar</runtime-relative-path> + <binary-origin>external/processtreekiller-1.0.5.jar</binary-origin> +- </class-path-extension> ++ </class-path-extension>--> + </data> + </configuration> + </project> diff --git a/extexecution.process/src/org/netbeans/modules/extexecution/process/ProcessesImpl.java b/extexecution.process/src/org/netbeans/modules/extexecution/process/ProcessesImpl.java index 8f75676..66d4301 100644 --- a/extexecution.process/src/org/netbeans/modules/extexecution/process/ProcessesImpl.java diff --git a/debian/patches/netbeans-svnclient.patch b/debian/patches/netbeans-svnclient.patch index 3f51f5e..7f63009 100644 --- a/debian/patches/netbeans-svnclient.patch +++ b/debian/patches/netbeans-svnclient.patch @@ -59,7 +59,7 @@ index aa7a77e..dddd782 100644 release.external/com.trilead.ssh2_1.0.0.build219_t20150519_2322.jar=modules/ext/trilead.ssh2.jar diff --git a/libs.svnClientAdapter.svnkit/nbproject/project.xml b/libs.svnClientAdapter.svnkit/nbproject/project.xml -index 090a6dc..9573f8f 100644 +index 090a6dc..18d0cbb 100644 --- a/libs.svnClientAdapter.svnkit/nbproject/project.xml +++ b/libs.svnClientAdapter.svnkit/nbproject/project.xml @@ -95,20 +95,24 @@ made subject to such option by the copyright holder. @@ -77,7 +77,7 @@ index 090a6dc..9573f8f 100644 + <binary-origin>external/svnkit.jar</binary-origin> + </class-path-extension> + <class-path-extension> -+ <runtime-relative-path>external/org.tmatesoft.svnkit_1.8.10.r10446_v20150526_1454.jar</runtime-relative-path> ++ <runtime-relative-path>ext/org.tmatesoft.svnkit_1.8.10.r10446_v20150526_1454.jar</runtime-relative-path> <binary-origin>external/org.tmatesoft.svnkit_1.8.10.r10446_v20150526_1454.jar</binary-origin> </class-path-extension> <class-path-extension> -- 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
