[ca-certificates-java] 19/46: Support new multiarch JRE packages in postinst.

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository ca-certificates-java.

commit 48670beb31d0b9ef394f90b1a6129e0b69c658c8
Author: Torsten Werner <twerner at debian.org>
Date:   Fri Dec 23 12:59:41 2011 +0000

    Support new multiarch JRE packages in postinst.
---
 debian/changelog | 6 ++++++
 debian/postinst  | 8 ++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3616954..c0aa673 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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)
diff --git a/debian/postinst b/debian/postinst
index fd4e96d..257d308 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -9,12 +9,12 @@ fi
 
 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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/ca-certificates-java.git