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

[Cédric Pineau]

The following commit has been merged in the master branch:
commit cdafa49b21a21cdbaa91c64f017e1bfa492780c9
Author: Cédric Pineau <cedric.pineau at gmail.com>
Date:   Fri Aug 17 11:26:20 2012 +0200

    mozilla-javaplugin.so and firefox-javaplugin.so alternative, version update

diff --git a/debian/changelog b/debian/changelog
index f366187..ed4981d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+java-package (0.51) unstable; urgency=low
+
+  * Add firefox-javaplugin.so alternative
+  
+  [Emmanuel Bourg]
+  * Improved detection of the JRE/JDK version (supports 2 digits Java 7 updates)
+  * Brand and naming cleanup
+  * Documentation directory changed to be /usr/share/doc/oracle-javaV-doc (for oracle)
+
+  [Joerg Schirottke]
+  * Add mozilla-javaplugin.so alternative
+
+ -- Cédric Pineau <cedric.pineau at gmail.com>  Sat, 18 Aug 2012 11:00:34 +0200
+
 java-package (0.50) unstable; urgency=low
 
   * Java-package reset for reintroduction in debian (removal of all
diff --git a/lib/oracle-j2re.sh b/lib/oracle-j2re.sh
index ad398a0..4532c07 100644
--- a/lib/oracle-j2re.sh
+++ b/lib/oracle-j2re.sh
@@ -69,6 +69,8 @@ install_no_man_alternatives $jvm_base$j2se_name/lib $oracle_jre_lib_hl
 plugin_dir="$jvm_base$j2se_name/lib/$DEB_BUILD_ARCH"
 install_browser_plugin "/usr/lib/iceweasel/plugins" "libjavaplugin.so" "iceweasel-javaplugin.so" "\$plugin_dir/libnpjp2.so"
 install_browser_plugin "/usr/lib/chromium/plugins" "libjavaplugin.so" "chromium-javaplugin.so" "\$plugin_dir/libnpjp2.so"
+install_browser_plugin "/usr/lib/mozilla/plugins" "libjavaplugin.so" "mozilla-javaplugin.so" "\$plugin_dir/libnpjp2.so"
+install_browser_plugin "/usr/lib/firefox/plugins" "libjavaplugin.so" "firefox-javaplugin.so" "\$plugin_dir/libnpjp2.so"
 EOF
 }
 
@@ -86,6 +88,8 @@ remove_alternatives $jvm_base$j2se_name/lib $oracle_jre_lib_hl
 plugin_dir="$jvm_base$j2se_name/lib/$DEB_BUILD_ARCH"
 remove_browser_plugin "iceweasel-javaplugin.so" "\$plugin_dir/libnpjp2.so"
 remove_browser_plugin "chromium-javaplugin.so" "\$plugin_dir/libnpjp2.so"
+remove_browser_plugin "mozilla-javaplugin.so" "\$plugin_dir/libnpjp2.so"
+remove_browser_plugin "firefox-javaplugin.so" "\$plugin_dir/libnpjp2.so"
 EOF
 }
 
diff --git a/lib/oracle-j2sdk.sh b/lib/oracle-j2sdk.sh
index 8c10b59..091a0cb 100644
--- a/lib/oracle-j2sdk.sh
+++ b/lib/oracle-j2sdk.sh
@@ -71,6 +71,8 @@ install_alternatives $jvm_base$j2se_name/bin $oracle_bin_jdk
 plugin_dir="$jvm_base$j2se_name/jre/lib/$DEB_BUILD_ARCH"
 install_browser_plugin "/usr/lib/iceweasel/plugins" "libjavaplugin.so" "iceweasel-javaplugin.so" "\$plugin_dir/libnpjp2.so"
 install_browser_plugin "/usr/lib/chromium/plugins" "libjavaplugin.so" "chromium-javaplugin.so" "\$plugin_dir/libnpjp2.so"
+install_browser_plugin "/usr/lib/mozilla/plugins" "libjavaplugin.so" "mozilla-javaplugin.so" "\$plugin_dir/libnpjp2.so"
+install_browser_plugin "/usr/lib/firefox/plugins" "libjavaplugin.so" "firefox-javaplugin.so" "\$plugin_dir/libnpjp2.so"
 EOF
 }
 
@@ -89,6 +91,8 @@ remove_alternatives $jvm_base$j2se_name/bin $oracle_bin_jdk
 plugin_dir="$jvm_base$j2se_name/jre/lib/$DEB_BUILD_ARCH"
 remove_browser_plugin "iceweasel-javaplugin.so" "\$plugin_dir/libnpjp2.so"
 remove_browser_plugin "chromium-javaplugin.so" "\$plugin_dir/libnpjp2.so"
+remove_browser_plugin "mozilla-javaplugin.so" "\$plugin_dir/libnpjp2.so"
+remove_browser_plugin "firefox-javaplugin.so" "\$plugin_dir/libnpjp2.so"
 EOF
 }
 

-- 
java-package packaging