The following commit has been merged in the master branch:
commit 9be7aa4fcd4a0153bf128d1a6ea0721835db490b
Author: Cédric Pineau <[email protected]>
Date: Sat Sep 1 16:59:23 2012 +0200
Applying patch to fix plugin directories. Closes #686216
diff --git a/debian/changelog b/debian/changelog
index 1cd4cc3..1a3662c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
-java-package (0.52) UNRELEASED; urgency=low
+java-package (0.52) unstable; urgency=low
+ [ Gabriele Giacone ]
* Add {mozilla,firefox}-javaplugin.so for update-java-alternatives.
+ * Fix plugin directories. Closes #686216
- -- Gabriele Giacone <[email protected]> Wed, 29 Aug 2012 20:02:25 +0200
+ -- Cédric Pineau <[email protected]> Sat, 01 Sep 2012 16:57:08 +0200
java-package (0.51) unstable; urgency=low
diff --git a/lib/common.sh b/lib/common.sh
index 4f9edd4..a9ed231 100644
--- a/lib/common.sh
+++ b/lib/common.sh
@@ -192,3 +192,13 @@ get_architecture() {
echo "Detected Debian GNU type: ${DEB_BUILD_GNU_TYPE:-N/A}"
}
+
+# get browser plugin directories
+get_browser_plugin_dirs() {
+ if [ $(lsb_release --id --short) = Ubuntu ]; then
+ export browser_plugin_dirs="xulrunner-addons firefox iceape iceweasel
mozilla midbrowser xulrunner"
+ else
+ export browser_plugin_dirs=mozilla
+ fi
+}
+
diff --git a/lib/oracle-j2re.sh b/lib/oracle-j2re.sh
index f371e17..db287cd 100644
--- a/lib/oracle-j2re.sh
+++ b/lib/oracle-j2re.sh
@@ -67,10 +67,9 @@ install_no_man_alternatives $jvm_base$j2se_name/bin
$oracle_no_man_jre_bin_jre
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"
+for b in $browser_plugin_dirs;do
+ install_browser_plugin "/usr/lib/\$b/plugins" "libjavaplugin.so"
"\$b-javaplugin.so" "\$plugin_dir/libnpjp2.so"
+done
EOF
}
@@ -86,10 +85,9 @@ remove_alternatives $jvm_base$j2se_name/bin
$oracle_no_man_jre_bin_jre
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"
+for b in $browser_plugin_dirs;do
+ remove_browser_plugin "\$b-javaplugin.so" "\$plugin_dir/libnpjp2.so"
+done
EOF
}
@@ -103,9 +101,8 @@ EOF
jinfos "jre" $jvm_base$j2se_name/bin/ $oracle_jre_bin_jre
jinfos "jre" $jvm_base$j2se_name/bin/ $oracle_no_man_jre_bin_jre
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"
+ for b in $browser_plugin_dirs;do
+ echo "plugin $b-javaplugin.so
$jvm_base$j2se_name/lib/$DEB_BUILD_ARCH/libnpjp2.so"
+ done
}
diff --git a/lib/oracle-j2sdk.sh b/lib/oracle-j2sdk.sh
index ff93d2a..7791388 100644
--- a/lib/oracle-j2sdk.sh
+++ b/lib/oracle-j2sdk.sh
@@ -69,10 +69,9 @@ install_no_man_alternatives $jvm_base$j2se_name/jre/lib
$oracle_jre_lib_hl
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"
+for b in $browser_plugin_dirs;do
+ install_browser_plugin "/usr/lib/\$b/plugins" "libjavaplugin.so"
"\$b-javaplugin.so" "\$plugin_dir/libnpjp2.so"
+done
EOF
}
@@ -89,10 +88,9 @@ remove_alternatives $jvm_base$j2se_name/jre/lib
$oracle_jre_lib_hl
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"
+for b in $browser_plugin_dirs;do
+ remove_browser_plugin "\$b-javaplugin.so" "\$plugin_dir/libnpjp2.so"
+done
EOF
}
@@ -107,8 +105,7 @@ EOF
jinfos "jre" $jvm_base$j2se_name/jre/bin/ $oracle_no_man_jre_bin_jre
jinfos "hl" $jvm_base$j2se_name/jre/lib/ $oracle_jre_lib_hl
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"
+ for b in $browser_plugin_dirs;do
+ echo "plugin iceweasel-javaplugin.so
$jvm_base$j2se_name/jre/lib/$DEB_BUILD_ARCH/libnpjp2.so"
+ done
}
diff --git a/make-jpkg b/make-jpkg
index 7173cb5..101d697 100755
--- a/make-jpkg
+++ b/make-jpkg
@@ -219,6 +219,9 @@ echo
# get architecture information
get_architecture
+# get browser plugin directories
+get_browser_plugin_dirs
+
jvm_base="/usr/lib/jvm/"
javadoc_base="/usr/share/doc/"
--
java-package packaging
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
