This is an automated email from the git hooks/post-receive script. jzobel-guest pushed a commit to branch master in repository netbeans.
commit d83b3df2480c8dc2e1242a3f917d4a3896d7cfcf Author: Joachim Zobel <[email protected]> Date: Fri Oct 11 07:34:39 2013 +0200 First attempt for a fix, not ye working --- debian/control | 2 +- debian/patches/netbeans~ide-launcher.patch | 31 +++++++++++++++++++++++++++- 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index ce0b7f7..0fdb474 100644 --- a/debian/control +++ b/debian/control @@ -116,7 +116,7 @@ Description: Java LayoutManager to allow placement in absolute positions Package: netbeans Architecture: all Depends: ${java:Depends}, ${misc:Depends}, libnb-platform13-java (>= 7.0), - openjdk-6-jdk | java6-sdk | java7-sdk, + java7-sdk, libnb-ide14-java (= ${binary:Version}), libnb-java5-java (= ${binary:Version}), libnb-apisupport3-java (= ${binary:Version}) diff --git a/debian/patches/netbeans~ide-launcher.patch b/debian/patches/netbeans~ide-launcher.patch index 4465add..46fbeb5 100644 --- a/debian/patches/netbeans~ide-launcher.patch +++ b/debian/patches/netbeans~ide-launcher.patch @@ -45,7 +45,36 @@ Index: netbeans-7.0.1+dfsg1/ide/launcher/unix/netbeans # #68373: look for userdir, but do not modify "$@" -@@ -194,7 +207,7 @@ +@@ -182,6 +195,28 @@ + fi + } + ++# Workaround for #720684, which is a broken openjdk-6 ++# with "Won't fix". 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 ++ java -version 2>&1 | grep -i "openjdk" | grep "IcedTea6" > /dev/null ++ if [ $? = "0" ] ; then ++ # We try to find a java 7 jdk ++ # since we depend on java-7 there should be one ++ java_candidate=`update-alternatives --list java |\ ++ grep "java-7" |\ ++ head -1` ++ if [ -n "$java_candidate" ] ; then ++ netbeans_jdkhome=`echo $java_candidate | sed 's#/jre/bin/java$##'` ++ else ++ echo "No suitable JDK found." ++ exit; ++ 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. + case "`uname`" in +@@ -194,7 +229,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
