This is an automated email from the git hooks/post-receive script. jzobel-guest pushed a commit to branch master in repository netbeans.
commit b77892ef6ff74a9271d5cbd4e68a1e5f72033139 Author: Joachim Zobel <[email protected]> Date: Fri Oct 25 19:39:55 2013 +0200 Another classpath workaround (#677125) --- .../netbeans~ide-launcher-7.0.1workarounds.patch | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/debian/patches/netbeans~ide-launcher-7.0.1workarounds.patch b/debian/patches/netbeans~ide-launcher-7.0.1workarounds.patch index 2d3af30..b29db09 100644 --- a/debian/patches/netbeans~ide-launcher-7.0.1workarounds.patch +++ b/debian/patches/netbeans~ide-launcher-7.0.1workarounds.patch @@ -1,28 +1,25 @@ Patches that hopefully can be removed after 7.0.1 -Index: netbeans-7.0.1+dfsg1/ide/launcher/unix/netbeans -=================================================================== ---- netbeans-7.0.1+dfsg1/ide/launcher/unix/netbeans -+++ netbeans-7.0.1+dfsg1/ide/launcher/unix/netbeans +--- a/ide/launcher/unix/netbeans ++++ b/ide/launcher/unix/netbeans @@ -174,6 +174,11 @@ netbeans_default_options="-J-XX:MaxPermSize=384m ${netbeans_default_options}" fi -+# "Fixes" #698514 by working around. -+# This should be removed after 7.0.1. ++# "Fixes" #698514 and #677125 by working around. +netbeans_default_options="${netbeans_default_options} \ -+ --cp:a /usr/share/java/svnClientAdapter.jar" ++ --cp:a /usr/share/java/svnClientAdapter.jar \ ++ --cp:a /usr/share/java/xercesImpl.jar" + launchNbexec() { nbexec=`grep -v "^#" "$progdir"/../etc/netbeans.clusters | grep -v "^$" | grep platform | while read X; do if expr "$X" : "/.*" >/dev/null; then -@@ -195,6 +200,28 @@ +@@ -195,6 +200,27 @@ fi } +# Workaround for #720684, which is a broken openjdk-6 +# with a hard to fix bug. See JDK-8021890. -+# This can be removed when openjdk-6 is no longer default +if [ -z "$netbeans_jdkhome" ] ; then + # if $netbeans_jdkhome has been set, we respect the choice + # Otherwise we check for the broken jdk @@ -40,7 +37,7 @@ Index: netbeans-7.0.1+dfsg1/ide/launcher/unix/netbeans + exit; + fi + fi -+fi ++fi + # in case of macosx, the apple.laf.useScreenMenuBar property should be ideally in the Info.plist file # but it doesn't get propagated into the executed java VM. -- 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
