[pkg-java] r14900 - in trunk/java-wrappers: . debian

[Vincent Fourmond]

Author: fourmond
Date: 2011-09-14 16:24:29 +0000 (Wed, 14 Sep 2011)
New Revision: 14900

Modified:
   trunk/java-wrappers/debian/changelog
   trunk/java-wrappers/jvm-list.sh
Log:
[java-wrappers] (almost) fix the new arch-dependent dirs for openjdk

Modified: trunk/java-wrappers/debian/changelog
===================================================================
--- trunk/java-wrappers/debian/changelog	2011-09-13 23:03:54 UTC (rev 14899)
+++ trunk/java-wrappers/debian/changelog	2011-09-14 16:24:29 UTC (rev 14900)
@@ -1,3 +1,11 @@
+java-wrappers (0.1.23) unstable; urgency=medium
+
+  * Correctly find the now architecture-dependent openjdk6 flavor (closes:
+    #640813)
+  * Urgency medium to avoid breaking applications in testing when openjdk6 migrates
+
+ -- Vincent Fourmond <fourmond at debian.org>  Fri, 09 Sep 2011 22:56:25 +0200
+
 java-wrappers (0.1.22) unstable; urgency=low
 
   * Now correctly following relative links from classpaths.

Modified: trunk/java-wrappers/jvm-list.sh
===================================================================
--- trunk/java-wrappers/jvm-list.sh	2011-09-13 23:03:54 UTC (rev 14899)
+++ trunk/java-wrappers/jvm-list.sh	2011-09-14 16:24:29 UTC (rev 14900)
@@ -22,6 +22,8 @@
 # They can also be used for the JAVA_FLAVOR environment variable, see
 # java-wrappers(7).
 
+__arch=$(dpkg-architecture -qDEB_HOST_ARCH)
+
 # default runtime
 __jvm_default="/usr/lib/jvm/default-java"
 
@@ -36,8 +38,9 @@
 # Now, free runtimes:
 __jvm_gcj2="/usr/lib/jvm/java-*-gcj-4.* "
 __jvm_gcj5="/usr/lib/jvm/java-1.5*-gcj-4.* "
-__jvm_openjdk6="/usr/lib/jvm/java-6-openjdk"
+__jvm_openjdk6="/usr/lib/jvm/java-6-openjdk-$__arch /usr/lib/jvm/java-6-openjdk"
 
+
 # And a few aliases
 __jvm_gcj="$__jvm_gcj2"
 __jvm_openjdk="$__jvm_openjdk6"