Author: mkoch Date: 2007-07-18 20:22:22 +0000 (Wed, 18 Jul 2007) New Revision: 3875
Modified: trunk/java-package/debian/changelog trunk/java-package/ibm-j2re1.5/install trunk/java-package/ibm-j2re1.5/remove trunk/java-package/ibm-j2re1.6/install trunk/java-package/ibm-j2re1.6/remove trunk/java-package/ibm-j2sdk1.5/install trunk/java-package/ibm-j2sdk1.5/remove trunk/java-package/ibm-j2sdk1.6/install trunk/java-package/ibm-j2sdk1.6/remove trunk/java-package/sun-j2re1.4/install trunk/java-package/sun-j2re1.4/remove trunk/java-package/sun-j2re1.5/install trunk/java-package/sun-j2re1.5/remove trunk/java-package/sun-j2re1.6/install trunk/java-package/sun-j2re1.6/remove trunk/java-package/sun-j2sdk1.4/install trunk/java-package/sun-j2sdk1.4/remove trunk/java-package/sun-j2sdk1.5/install trunk/java-package/sun-j2sdk1.5/remove trunk/java-package/sun-j2sdk1.6/install trunk/java-package/sun-j2sdk1.6/remove Log: java-package (0.32) UNRELEASED; urgency=low * Added support for iceweasel. Closes: #433445. -- Michael Koch <[EMAIL PROTECTED]> Wed, 18 Jul 2007 21:30:29 +0200 Modified: trunk/java-package/debian/changelog =================================================================== --- trunk/java-package/debian/changelog 2007-07-17 22:42:46 UTC (rev 3874) +++ trunk/java-package/debian/changelog 2007-07-18 20:22:22 UTC (rev 3875) @@ -1,3 +1,9 @@ +java-package (0.32) UNRELEASED; urgency=low + + * Added support for iceweasel. Closes: #433445. + + -- Michael Koch <[EMAIL PROTECTED]> Wed, 18 Jul 2007 21:30:29 +0200 + java-package (0.31) unstable; urgency=low * Reapplied changes from 0.28 to 0.29. Closes: 322843. Modified: trunk/java-package/ibm-j2re1.5/install =================================================================== --- trunk/java-package/ibm-j2re1.5/install 2007-07-17 22:42:46 UTC (rev 3874) +++ trunk/java-package/ibm-j2re1.5/install 2007-07-18 20:22:22 UTC (rev 3875) @@ -70,3 +70,11 @@ "firefox-javaplugin.so" \ "$plugin_dir/ns7/libjavaplugin_oji.so" \ "$priority" + + # iceweasel + iceweasel_dir="/usr/lib/mozilla-iceweasel/plugins" + + install_java_plugin "$iceweasel_dir" "libjavaplugin.so" \ + "iceweasel-javaplugin.so" \ + "$plugin_dir/ns7/libjavaplugin_oji.so" \ + "$priority" Modified: trunk/java-package/ibm-j2re1.5/remove =================================================================== --- trunk/java-package/ibm-j2re1.5/remove 2007-07-17 22:42:46 UTC (rev 3874) +++ trunk/java-package/ibm-j2re1.5/remove 2007-07-18 20:22:22 UTC (rev 3875) @@ -46,3 +46,7 @@ # firefox remove_java_plugin "firefox-javaplugin.so" \ "$plugin_dir/libjavaplugin_oji.so" + + # iceweasel + remove_java_plugin "iceweasel-javaplugin.so" \ + "$plugin_dir/ns7/libjavaplugin_oji.so" Modified: trunk/java-package/ibm-j2re1.6/install =================================================================== --- trunk/java-package/ibm-j2re1.6/install 2007-07-17 22:42:46 UTC (rev 3874) +++ trunk/java-package/ibm-j2re1.6/install 2007-07-18 20:22:22 UTC (rev 3875) @@ -70,3 +70,11 @@ "firefox-javaplugin.so" \ "$plugin_dir/ns7/libjavaplugin_oji.so" \ "$priority" + + # iceweasel + iceweasel_dir="/usr/lib/mozilla-iceweasel/plugins" + + install_java_plugin "$iceweasel_dir" "libjavaplugin.so" \ + "iceweasel-javaplugin.so" \ + "$plugin_dir/ns7/libjavaplugin_oji.so" \ + "$priority" Modified: trunk/java-package/ibm-j2re1.6/remove =================================================================== --- trunk/java-package/ibm-j2re1.6/remove 2007-07-17 22:42:46 UTC (rev 3874) +++ trunk/java-package/ibm-j2re1.6/remove 2007-07-18 20:22:22 UTC (rev 3875) @@ -46,3 +46,7 @@ # firefox remove_java_plugin "firefox-javaplugin.so" \ "$plugin_dir/libjavaplugin_oji.so" + + # iceweasel + remove_java_plugin "iceweasel-javaplugin.so" \ + "$plugin_dir/ns7/libjavaplugin_oji.so" Modified: trunk/java-package/ibm-j2sdk1.5/install =================================================================== --- trunk/java-package/ibm-j2sdk1.5/install 2007-07-17 22:42:46 UTC (rev 3874) +++ trunk/java-package/ibm-j2sdk1.5/install 2007-07-18 20:22:22 UTC (rev 3875) @@ -81,3 +81,11 @@ "firefox-javaplugin.so" \ "$plugin_dir/ns7/libjavaplugin_oji.so" \ "$priority" + + # iceweasel + iceweasel_dir="/usr/lib/mozilla-iceweasel/plugins" + + install_java_plugin "$iceweasel_dir" "libjavaplugin.so" \ + "iceweasel-javaplugin.so" \ + "$plugin_dir/ns7/libjavaplugin_oji.so" \ + "$priority" Modified: trunk/java-package/ibm-j2sdk1.5/remove =================================================================== --- trunk/java-package/ibm-j2sdk1.5/remove 2007-07-17 22:42:46 UTC (rev 3874) +++ trunk/java-package/ibm-j2sdk1.5/remove 2007-07-18 20:22:22 UTC (rev 3875) @@ -59,3 +59,7 @@ # firefox (1.5+) remove_java_plugin "firefox-javaplugin.so" \ "$plugin_dir/libjavaplugin_oji.so" + + # iceweasel + remove_java_plugin "iceweasel-javaplugin.so" \ + "$plugin_dir/ns7/libjavaplugin_oji.so" Modified: trunk/java-package/ibm-j2sdk1.6/install =================================================================== --- trunk/java-package/ibm-j2sdk1.6/install 2007-07-17 22:42:46 UTC (rev 3874) +++ trunk/java-package/ibm-j2sdk1.6/install 2007-07-18 20:22:22 UTC (rev 3875) @@ -81,3 +81,11 @@ "firefox-javaplugin.so" \ "$plugin_dir/ns7/libjavaplugin_oji.so" \ "$priority" + + # iceweasel + iceweasel_dir="/usr/lib/mozilla-iceweasel/plugins" + + install_java_plugin "$iceweasel_dir" "libjavaplugin.so" \ + "iceweasel-javaplugin.so" \ + "$plugin_dir/ns7/libjavaplugin_oji.so" \ + "$priority" Modified: trunk/java-package/ibm-j2sdk1.6/remove =================================================================== --- trunk/java-package/ibm-j2sdk1.6/remove 2007-07-17 22:42:46 UTC (rev 3874) +++ trunk/java-package/ibm-j2sdk1.6/remove 2007-07-18 20:22:22 UTC (rev 3875) @@ -59,3 +59,7 @@ # firefox (1.5+) remove_java_plugin "firefox-javaplugin.so" \ "$plugin_dir/libjavaplugin_oji.so" + + # iceweasel + remove_java_plugin "iceweasel-javaplugin.so" \ + "$plugin_dir/ns7/libjavaplugin_oji.so" Modified: trunk/java-package/sun-j2re1.4/install =================================================================== --- trunk/java-package/sun-j2re1.4/install 2007-07-17 22:42:46 UTC (rev 3874) +++ trunk/java-package/sun-j2re1.4/install 2007-07-18 20:22:22 UTC (rev 3875) @@ -58,3 +58,11 @@ --install "$firefox_dir/libjavaplugin.so" \ "firefox-javaplugin.so" \ "$plugin_dir/ns610-gcc32/libjavaplugin_oji.so" "$priority" + +# iceweasel +iceweasel_dir="/usr/lib/mozilla-iceweasel/plugins" +[ -d "$iceweasel_dir" ] || install -d -m 755 "$iceweasel_dir" +update-alternatives \ + --install "$iceweasel_dir/libjavaplugin.so" \ + "iceweasel-javaplugin.so" \ + "$plugin_dir/ns610-gcc32/libjavaplugin_oji.so" "$priority" Modified: trunk/java-package/sun-j2re1.4/remove =================================================================== --- trunk/java-package/sun-j2re1.4/remove 2007-07-17 22:42:46 UTC (rev 3874) +++ trunk/java-package/sun-j2re1.4/remove 2007-07-18 20:22:22 UTC (rev 3875) @@ -40,3 +40,7 @@ # firefox update-alternatives \ --remove "firefox-javaplugin.so" "$plugin_dir/ns610-gcc32/libjavaplugin_oji.so" + +# iceweasel +update-alternatives \ + --remove "iceweasel-javaplugin.so" "$plugin_dir/ns610-gcc32/libjavaplugin_oji.so" Modified: trunk/java-package/sun-j2re1.5/install =================================================================== --- trunk/java-package/sun-j2re1.5/install 2007-07-17 22:42:46 UTC (rev 3874) +++ trunk/java-package/sun-j2re1.5/install 2007-07-18 20:22:22 UTC (rev 3875) @@ -61,3 +61,11 @@ --install "$firefox_dir/libjavaplugin.so" \ "firefox-javaplugin.so" \ "$plugin_dir/ns7/libjavaplugin_oji.so" "$priority" + +# iceweasel +iceweasel_dir="/usr/lib/mozilla-iceweasel/plugins" +[ -d "$iceweasel_dir" ] || install -d -m 755 "$iceweasel_dir" +update-alternatives \ + --install "$iceweasel_dir/libjavaplugin.so" \ + "iceweasel-javaplugin.so" \ + "$plugin_dir/ns7/libjavaplugin_oji.so" "$priority" Modified: trunk/java-package/sun-j2re1.5/remove =================================================================== --- trunk/java-package/sun-j2re1.5/remove 2007-07-17 22:42:46 UTC (rev 3874) +++ trunk/java-package/sun-j2re1.5/remove 2007-07-18 20:22:22 UTC (rev 3875) @@ -43,3 +43,7 @@ # firefox update-alternatives \ --remove "firefox-javaplugin.so" "$plugin_dir/ns7/libjavaplugin_oji.so" + +# iceweasel +update-alternatives \ + --remove "iceweasel-javaplugin.so" "$plugin_dir/ns7/libjavaplugin_oji.so" Modified: trunk/java-package/sun-j2re1.6/install =================================================================== --- trunk/java-package/sun-j2re1.6/install 2007-07-17 22:42:46 UTC (rev 3874) +++ trunk/java-package/sun-j2re1.6/install 2007-07-18 20:22:22 UTC (rev 3875) @@ -61,3 +61,12 @@ --install "$firefox_dir/libjavaplugin.so" \ "firefox-javaplugin.so" \ "$plugin_dir/ns7/libjavaplugin_oji.so" "$priority" + +# iceweasel +iceweasel_dir="/usr/lib/mozilla-iceweasel/plugins" +[ -d "$iceweasel_dir" ] || install -d -m 755 "$iceweasel_dir" +update-alternatives \ + --install "$iceweasel_dir/libjavaplugin.so" \ + "iceweasel-javaplugin.so" \ + "$plugin_dir/ns7/libjavaplugin_oji.so" "$priority" + Modified: trunk/java-package/sun-j2re1.6/remove =================================================================== --- trunk/java-package/sun-j2re1.6/remove 2007-07-17 22:42:46 UTC (rev 3874) +++ trunk/java-package/sun-j2re1.6/remove 2007-07-18 20:22:22 UTC (rev 3875) @@ -43,3 +43,7 @@ # firefox update-alternatives \ --remove "firefox-javaplugin.so" "$plugin_dir/ns7/libjavaplugin_oji.so" + +# iceweasel +update-alternatives \ + --remove "iceweasel-javaplugin.so" "$plugin_dir/ns7/libjavaplugin_oji.so" Modified: trunk/java-package/sun-j2sdk1.4/install =================================================================== --- trunk/java-package/sun-j2sdk1.4/install 2007-07-17 22:42:46 UTC (rev 3874) +++ trunk/java-package/sun-j2sdk1.4/install 2007-07-18 20:22:22 UTC (rev 3875) @@ -74,3 +74,11 @@ --install "$firefox_dir/libjavaplugin.so" \ "firefox-javaplugin.so" \ "$plugin_dir/ns610-gcc32/libjavaplugin_oji.so" "$priority" + +# iceweasel +iceweasel_dir="/usr/lib/iceweasel/plugins" +[ -d "$iceweasel_dir" ] || install -d -m 755 "$iceweasel_dir" +update-alternatives \ + --install ""$iceweasel_dir/libjavaplugin.so" \ + "iceweasel-javaplugin.so" \ + "$plugin_dir/ns610-gcc32/libjavaplugin_oji.so" "$priority" Modified: trunk/java-package/sun-j2sdk1.4/remove =================================================================== --- trunk/java-package/sun-j2sdk1.4/remove 2007-07-17 22:42:46 UTC (rev 3874) +++ trunk/java-package/sun-j2sdk1.4/remove 2007-07-18 20:22:22 UTC (rev 3875) @@ -54,3 +54,7 @@ # firefox update-alternatives \ --remove "firefox-javaplugin.so" "$plugin_dir/ns610-gcc32/libjavaplugin_oji.so" + +# iceweasel +update-alternatives \ + --remove "iceweasel-javaplugin.so" "$plugin_dir/ns610-gcc32/libjavaplugin_oji.so" Modified: trunk/java-package/sun-j2sdk1.5/install =================================================================== --- trunk/java-package/sun-j2sdk1.5/install 2007-07-17 22:42:46 UTC (rev 3874) +++ trunk/java-package/sun-j2sdk1.5/install 2007-07-18 20:22:22 UTC (rev 3875) @@ -86,3 +86,11 @@ --install "$firefox_dir/libjavaplugin.so" \ "firefox-javaplugin.so" \ "$plugin_dir/ns7/libjavaplugin_oji.so" "$priority" + +# iceweasel +iceweasel_dir="/usr/lib/iceweasel/plugins" +[ -d "$iceweasel_dir" ] || install -d -m 755 "$iceweasel_dir" +update-alternatives \ + --install ""$iceweasel_dir/libjavaplugin.so" \ + "iceweasel-javaplugin.so" \ + "$plugin_dir/ns7/libjavaplugin_oji.so" "$priority" Modified: trunk/java-package/sun-j2sdk1.5/remove =================================================================== --- trunk/java-package/sun-j2sdk1.5/remove 2007-07-17 22:42:46 UTC (rev 3874) +++ trunk/java-package/sun-j2sdk1.5/remove 2007-07-18 20:22:22 UTC (rev 3875) @@ -67,3 +67,7 @@ # firefox update-alternatives \ --remove "firefox-javaplugin.so" "$plugin_dir/ns7/libjavaplugin_oji.so" + +# iceweasel +update-alternatives \ + --remove "iceweasel-javaplugin.so" "$plugin_dir/ns7/libjavaplugin_oji.so" Modified: trunk/java-package/sun-j2sdk1.6/install =================================================================== --- trunk/java-package/sun-j2sdk1.6/install 2007-07-17 22:42:46 UTC (rev 3874) +++ trunk/java-package/sun-j2sdk1.6/install 2007-07-18 20:22:22 UTC (rev 3875) @@ -86,3 +86,11 @@ --install "$firefox_dir/libjavaplugin.so" \ "firefox-javaplugin.so" \ "$plugin_dir/ns7/libjavaplugin_oji.so" "$priority" + +# iceweasel +iceweasel_dir="/usr/lib/iceweasel/plugins" +[ -d "$iceweasel_dir" ] || install -d -m 755 "$iceweasel_dir" +update-alternatives \ + --install ""$iceweasel_dir/libjavaplugin.so" \ + "iceweasel-javaplugin.so" \ + "$plugin_dir/ns7/libjavaplugin_oji.so" "$priority" Modified: trunk/java-package/sun-j2sdk1.6/remove =================================================================== --- trunk/java-package/sun-j2sdk1.6/remove 2007-07-17 22:42:46 UTC (rev 3874) +++ trunk/java-package/sun-j2sdk1.6/remove 2007-07-18 20:22:22 UTC (rev 3875) @@ -67,3 +67,7 @@ # firefox update-alternatives \ --remove "firefox-javaplugin.so" "$plugin_dir/ns7/libjavaplugin_oji.so" + +# iceweasel +update-alternatives \ + --remove "iceweasel-javaplugin.so" "$plugin_dir/ns7/libjavaplugin_oji.so" _______________________________________________ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits