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 09d66bdfce4c6e1b8415184a44527da0c86e1be2 Author: Torsten Werner <[email protected]> Date: Mon Sep 12 19:29:02 2011 +0000 Support OpenJDK 7. (Closes: #641305) --- debian/changelog | 3 ++- debian/jks-keystore.hook | 21 ++++++++++++++------- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index 59887f0..3616954 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ ca-certificates-java (20110912) unstable; urgency=low * Support new multiarch JRE packages in jks-keystore. (Closes: #641306) + * Support OpenJDK 7. (Closes: #641305) - -- Torsten Werner <[email protected]> Mon, 12 Sep 2011 20:49:07 +0200 + -- Torsten Werner <[email protected]> Mon, 12 Sep 2011 21:23:22 +0200 ca-certificates-java (20110816) unstable; urgency=low diff --git a/debian/jks-keystore.hook b/debian/jks-keystore.hook index b625be0..27c956e 100644 --- a/debian/jks-keystore.hook +++ b/debian/jks-keystore.hook @@ -23,12 +23,12 @@ if ! mountpoint -q /proc; then exit 1 fi -for jvm in java-6-openjdk* java-7-openjdk* java-6-sun; do - if [ -x /usr/lib/jvm/$jvm/bin/java ]; then +for jdir in /usr/lib/jvm/java-[67]-openjdk* /usr/lib/jvm/java-6-sun; do + if [ -x $jdir/bin/java ]; then break fi done -export JAVA_HOME=/usr/lib/jvm/$jvm +export JAVA_HOME=$jdir PATH=$JAVA_HOME/bin:$PATH temp_jvm_cfg= @@ -39,11 +39,15 @@ if [ ! -f /etc/$jvm/jvm.cfg ]; then printf -- "-server KNOWN\n" > $temp_jvm_cfg fi -if which dpkg-query --version >/dev/null; then - nsspkg=$(dpkg-query -L libnss3 | sed -n 's,\(.*\)/libnss3\.so$,\1,p') - nssjdk=$(sed -n '/nssLibraryDirectory/s/.*= *\(.*\)/\1/p' /etc/$jvm/security/nss.cfg) +if dpkg-query --version >/dev/null; then + nsspkg=$(dpkg-query -L libnss3-1d | sed -n 's,\(.*\)/libnss3\.so$,\1,p') + nssjdk=$(sed -n '/nssLibraryDirectory/s/.*= *\(.*\)/\1/p' $jdir/jre/lib/security/nss.cfg) if [ "$nsspkg" != "$nssjdk" ]; then - ln -sf $nsspkg/libnss3.so $nssjdk/libnss3.so + ln -sf $nsspkg/libnss3.so $nssjdk/ + fi + softokn3pkg=$(dpkg-query -L libnss3-1d | sed -n 's,\(.*\)/libsoftokn3\.so$,\1,p') + if [ "$softokn3pkg" != "$nssjdk" ]; then + ln -sf $softokn3pkg/libsoftokn3.so $nssjdk/ fi fi @@ -53,6 +57,9 @@ do_cleanup() if [ "$nsspkg" != "$nssjdk" ]; then rm -f $nssjdk/libnss3.so fi + if [ "$softokn3pkg" != "$nssjdk" ]; then + rm -f $nssjdk/libsoftokn3.so + fi } 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 _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
