This is an automated email from the git hooks/post-receive script. jzobel-guest pushed a commit to branch master in repository netbeans.
commit 0d61e5de49e20dd26083611e928fa9603fd4cf09 Author: Joachim Zobel <[email protected]> Date: Sat Oct 26 17:17:19 2013 +0200 simplified by going straight for openjdk-7-jdk --- debian/control | 2 +- .../netbeans~ide-launcher-7.0.1workarounds.patch | 29 +++++++------------- 2 files changed, 11 insertions(+), 20 deletions(-) diff --git a/debian/control b/debian/control index 150a59c..8223848 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-7-jdk|java7-jdk, + openjdk-7-jdk, libnb-ide14-java (= ${binary:Version}), libnb-java5-java (= ${binary:Version}), libnb-apisupport3-java (= ${binary:Version}) diff --git a/debian/patches/netbeans~ide-launcher-7.0.1workarounds.patch b/debian/patches/netbeans~ide-launcher-7.0.1workarounds.patch index 0a1af37..9f324b8 100644 --- a/debian/patches/netbeans~ide-launcher-7.0.1workarounds.patch +++ b/debian/patches/netbeans~ide-launcher-7.0.1workarounds.patch @@ -1,9 +1,11 @@ Patches that hopefully can be removed after 7.0.1 +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 2011-07-28 20:45:40.000000000 +0100 -+++ netbeans-7.0.1+dfsg1/ide/launcher/unix/netbeans 2011-08-02 23:42:39.694164784 +0100 +--- netbeans-7.0.1+dfsg1/ide/launcher/unix/netbeans ++++ netbeans-7.0.1+dfsg1/ide/launcher/unix/netbeans @@ -174,6 +174,11 @@ netbeans_default_options="-J-XX:MaxPermSize=384m ${netbeans_default_options}" fi @@ -16,29 +18,18 @@ Index: netbeans-7.0.1+dfsg1/ide/launcher/unix/netbeans 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,27 @@ +@@ -195,6 +200,16 @@ fi } +# Workaround for #720684, which is a broken openjdk-6 -+# with a hard to fix bug. See JDK-8021890. ++# with a won't fix bug. See JDK-8021890. +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 ++ # Otherwise we use openjdk-7 ++ jvmpath=/usr/lib/jvm ++ jdk7=`ls -1 $jvmpath | grep java-7-openjdk | grep -v common | head -1` ++ netbeans_jdkhome=$jvmpath/$jdk7 +fi + # in case of macosx, the apple.laf.useScreenMenuBar property should be ideally in the Info.plist file -- 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
