[SCM] java-package packaging branch, master, updated. 6f3337a85a01f4aa6900df2509d5b37f6be9d254

[Gabriele Giacone]

The following commit has been merged in the master branch:
commit 6f3337a85a01f4aa6900df2509d5b37f6be9d254
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date:   Wed Aug 29 20:04:48 2012 +0200

    Add {mozilla,firefox}-javaplugin.so for update-java-alternatives.

diff --git a/debian/changelog b/debian/changelog
index e657fd6..1cd4cc3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+java-package (0.52) UNRELEASED; urgency=low
+
+  * Add {mozilla,firefox}-javaplugin.so for update-java-alternatives.
+
+ -- Gabriele Giacone <1o5g4r8o at gmail.com>  Wed, 29 Aug 2012 20:02:25 +0200
+
 java-package (0.51) unstable; urgency=low
 
   * Add firefox-javaplugin.so alternative Closes: #673670 and LP: #1024368
diff --git a/lib/oracle-j2re.sh b/lib/oracle-j2re.sh
index a7b6207..f371e17 100644
--- a/lib/oracle-j2re.sh
+++ b/lib/oracle-j2re.sh
@@ -105,5 +105,7 @@ EOF
     jinfos "hl" $jvm_base$j2se_name/lib/ $oracle_jre_lib_hl
     echo "plugin iceweasel-javaplugin.so $jvm_base$j2se_name/lib/$DEB_BUILD_ARCH/libnpjp2.so"
     echo "plugin chromium-javaplugin.so $jvm_base$j2se_name/lib/$DEB_BUILD_ARCH/libnpjp2.so"
+    echo "plugin mozilla-javaplugin.so $jvm_base$j2se_name/lib/$DEB_BUILD_ARCH/libnpjp2.so"
+    echo "plugin firefox-javaplugin.so $jvm_base$j2se_name/lib/$DEB_BUILD_ARCH/libnpjp2.so"
 }
 
diff --git a/lib/oracle-j2sdk.sh b/lib/oracle-j2sdk.sh
index 16db30e..ff93d2a 100644
--- a/lib/oracle-j2sdk.sh
+++ b/lib/oracle-j2sdk.sh
@@ -109,4 +109,6 @@ EOF
     jinfos "jdk" $jvm_base$j2se_name/bin/ $oracle_bin_jdk
     echo "plugin iceweasel-javaplugin.so $jvm_base$j2se_name/jre/lib/$DEB_BUILD_ARCH/libnpjp2.so"
     echo "plugin chromium-javaplugin.so $jvm_base$j2se_name/jre/lib/$DEB_BUILD_ARCH/libnpjp2.so"
+    echo "plugin mozilla-javaplugin.so $jvm_base$j2se_name/jre/lib/$DEB_BUILD_ARCH/libnpjp2.so"
+    echo "plugin firefox-javaplugin.so $jvm_base$j2se_name/jre/lib/$DEB_BUILD_ARCH/libnpjp2.so"
 }

-- 
java-package packaging