[pkg-java] r15582 - trunk/ca-certificates-java/debian

[Torsten Werner]

Author: twerner
Date: 2011-12-23 12:59:41 +0000 (Fri, 23 Dec 2011)
New Revision: 15582

Modified:
   trunk/ca-certificates-java/debian/changelog
   trunk/ca-certificates-java/debian/postinst
Log:
Support new multiarch JRE packages in postinst.

Modified: trunk/ca-certificates-java/debian/changelog
===================================================================
--- trunk/ca-certificates-java/debian/changelog	2011-12-23 00:48:54 UTC (rev 15581)
+++ trunk/ca-certificates-java/debian/changelog	2011-12-23 12:59:41 UTC (rev 15582)
@@ -1,3 +1,9 @@
+ca-certificates-java (20111223) unstable; urgency=low
+
+  * Support new multiarch JRE packages in postinst.
+
+ -- Torsten Werner <twerner at debian.org>  Fri, 23 Dec 2011 13:46:15 +0100
+
 ca-certificates-java (20110912) unstable; urgency=low
 
   * Support new multiarch JRE packages in jks-keystore. (Closes: #641306)

Modified: trunk/ca-certificates-java/debian/postinst
===================================================================
--- trunk/ca-certificates-java/debian/postinst	2011-12-23 00:48:54 UTC (rev 15581)
+++ trunk/ca-certificates-java/debian/postinst	2011-12-23 12:59:41 UTC (rev 15582)
@@ -9,12 +9,12 @@
 
 setup_path()
 {
-    for jvm in java-6-openjdk java-7-openjdk java-6-sun; do
-	if [ -x /usr/lib/jvm/$jvm/bin/java ]; then
+    for JAVA_HOME in /usr/lib/jvm/java-[67]-openjdk* /usr/lib/jvm/java-6-sun; do
+        if [ -x $JAVA_HOME/bin/java ]; then
 	    break
-	fi
+        fi
     done
-    export JAVA_HOME=/usr/lib/jvm/$jvm
+    jvm=$(basename $JAVA_HOME | sed 's,-openjdk-.*,-openjdk,')   # multiarch fixup
     PATH=$JAVA_HOME/bin:$PATH
 
     CLASSPATH=/usr/share/ca-certificates-java