Please review - netbeans_7.0.1+dfsg1-6

[Joachim Zobel <jzobel@heute-morgen.de>]

Hi.

I have implemented 2 fixes (or rather workarounds) in the netbeans
launcher script. Could a kind soul please review the patch.

Thx,
Joachim

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 <jz-2013@heute.morgen.de>  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/control b/debian/control
index ce0b7f7..150a59c 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,
+ openjdk-7-jdk|java7-jdk,
  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..e453131 100644
--- a/debian/patches/netbeans~ide-launcher.patch
+++ b/debian/patches/netbeans~ide-launcher.patch
@@ -45,7 +45,48 @@ Index: netbeans-7.0.1+dfsg1/ide/launcher/unix/netbeans
  
  
  # #68373: look for userdir, but do not modify "$@"
-@@ -194,7 +207,7 @@
+@@ -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
+ }
+ 
++# 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
++    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 +234,7 @@
              --branding nb \
              --clusters '"$netbeans_clusters"' \
              -J-Dnetbeans.importclass=org.netbeans.upgrade.AutoUpgrade \