This is an automated email from the git hooks/post-receive script. jzobel-guest pushed a commit to branch master in repository netbeans.
commit 59a91ee01b76f5e7d12cfc6f19f9679e48eb2d02 Author: Joachim Zobel <[email protected]> Date: Tue Oct 15 06:52:24 2013 +0200 Workaround implemented to fix #698514 --- debian/changelog | 7 +++++++ debian/patches/netbeans~ide-launcher.patch | 16 ++++++++++++++-- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index a23eec5..825f70a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +netbeans (7.0.1+dfsg1-6) stable; urgency=medium + + * Workaround for bug #720684 in openjdk-6-jdk. + * Workaround for bug #698514 (Closes: #698514). + + -- Joachim Zobel <[email protected]> Fri, 11 Oct 2013 18:47:04 +0200 + netbeans (7.0.1+dfsg1-5) unstable; urgency=low * Include junit library definitions. diff --git a/debian/patches/netbeans~ide-launcher.patch b/debian/patches/netbeans~ide-launcher.patch index e581e83..e453131 100644 --- a/debian/patches/netbeans~ide-launcher.patch +++ b/debian/patches/netbeans~ide-launcher.patch @@ -45,7 +45,19 @@ Index: netbeans-7.0.1+dfsg1/ide/launcher/unix/netbeans # #68373: look for userdir, but do not modify "$@" -@@ -182,6 +195,28 @@ +@@ -161,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. ++netbeans_default_options="${netbeans_default_options} \ ++ --cp:a /usr/share/java/svnClientAdapter.jar" ++ + launchNbexec() { + nbexec=`grep -v "^#" "$progdir"/../etc/netbeans.clusters | grep -v "^$" | grep platform | while read X; do + if expr "$X" : "/.*" >/dev/null; then +@@ -182,6 +200,28 @@ fi } @@ -74,7 +86,7 @@ Index: netbeans-7.0.1+dfsg1/ide/launcher/unix/netbeans # 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. case "`uname`" in -@@ -194,7 +229,7 @@ +@@ -194,7 +234,7 @@ --branding nb \ --clusters '"$netbeans_clusters"' \ -J-Dnetbeans.importclass=org.netbeans.upgrade.AutoUpgrade \ -- 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
