Merge lp:~kroq-gar78/ubuntu/quantal/visualvm/fix-start into lp:ubuntu/quantal/visualvm

[Aditya V]

I fixed the problems that caused jvisualvm not to start with OpenJDK 6 and 7.

[Jamie Strandboge (jdstrand)]

Thanks for the merge. It looks great!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-04-22 14:50:10 +0000
+++ debian/changelog	2012-05-27 05:30:26 +0000
@@ -1,3 +1,11 @@
+visualvm (1.3.2-0ubuntu3) quantal; urgency=low
+
+  * debian/jvisualvm.sh:
+    - look for OpenJDK 7 files also (LP: #937710)
+    - use multiarch-friendly paths for OpenJDK (LP: #1004370)
+
+ -- Aditya Vaidya <[e-mail]>  Sun, 27 May 2012 00:02:57 -0500
+
 visualvm (1.3.2-0ubuntu2) precise; urgency=low
 
   * Build-depend on libnb-platform12-java, since the default is now

=== modified file 'debian/jvisualvm.sh'
--- debian/jvisualvm.sh	2011-09-08 13:38:19 +0000
+++ debian/jvisualvm.sh	2012-05-27 05:30:26 +0000
@@ -8,9 +8,10 @@
 progdir=/usr/bin
 APPNAME=visualvm
 BASEDIR=/usr/lib/visualvm
+ARCH=`dpkg --print-architecture`
 
 jdkhome=
-for j in /usr/lib/jvm/java-6-openjdk /usr/lib/jvm/java-6-sun; do
+for j in /usr/lib/jvm/java-6-openjdk-$ARCH /usr/lib/jvm/java-6-sun /usr/lib/jvm/java-7-openjdk-$ARCH; do
     if [ -x $j/bin/javac ]; then
 	jdkhome=$j
 	break