r2105 - in trunk/java-package: debian ibm-j2re1.5 ibm-j2sdk1.5
Barry Hawkins
barryh-guest at costa.debian.org
Thu May 4 03:18:31 UTC 2006
Author: barryh-guest
Date: 2006-05-04 03:18:30 +0000 (Thu, 04 May 2006)
New Revision: 2105
Modified:
trunk/java-package/debian/changelog
trunk/java-package/ibm-j2re1.5/install
trunk/java-package/ibm-j2re1.5/remove
trunk/java-package/ibm-j2sdk1.5/install
trunk/java-package/ibm-j2sdk1.5/remove
Log:
Updated changelog and removed architectural restrictions for IBM Java 5 browser plugin integration related to Bug #343837
Modified: trunk/java-package/debian/changelog
===================================================================
--- trunk/java-package/debian/changelog 2006-05-04 02:30:20 UTC (rev 2104)
+++ trunk/java-package/debian/changelog 2006-05-04 03:18:30 UTC (rev 2105)
@@ -2,10 +2,12 @@
* Modified to reflect migration to Subversion
* Corrected test for AMD64 architecture during plug-in detection
- * Corrected detected version for IBM 1.5 JDK on AMD64 (Closes: #345775)
+ * Corrected detected version for IBM Java 5 JDK on AMD64 (Closes: #345775)
* Repaired alternatives handling for IBM JREs and JDKs (Closes: #338569)
* Corrected pathing for alternatives installation for Mozilla and
Firefox plugins (Closes: #341751)
+ * Relaxed architectural restrictions on plugin alternative
+ installation for IBM Java 5 JREs and JDKs (Closes: #343837)
* Added plugin installation for the new packaging of Firefox 1.5 and
later (Closes: #341749)
* Modified warning suppression for dh_shlibdeps to accommodate
@@ -15,7 +17,7 @@
* Refactored architecture evaluation to eliminate repetition and
evaluate DEB_BUILD_GNU_TYPE correctly for i486-linux-gnu
- -- Barry Hawkins <barry at alltc.com> Sun, 26 Feb 2006 00:54:00 -0500
+ -- Barry Hawkins <barry at alltc.com> Wed, 03 May 2006 22:37:00 -0400
java-package (0.27) unstable; urgency=low
Modified: trunk/java-package/ibm-j2re1.5/install
===================================================================
--- trunk/java-package/ibm-j2re1.5/install 2006-05-04 02:30:20 UTC (rev 2104)
+++ trunk/java-package/ibm-j2re1.5/install 2006-05-04 03:18:30 UTC (rev 2105)
@@ -36,42 +36,37 @@
program_alternative tnameserv
program_alternative unpack200
- # the plugin is only available for i386 architecture
+ # assemble the plugin path
+ plugin_dir="$j2se_base/jre/bin"
- if [ $(dpkg --print-architecture) = i386 ] ; then
+ # netscape
+ netscape_dir="/usr/lib/netscape/plugins-libc6"
- # assemble the plugin path
- plugin_dir="$j2se_base/jre/bin"
+ install_java_plugin "$netscape_dir" "libjavaplugin.so" \
+ "netscape-javaplugin.so" \
+ "$plugin_dir/libjavaplugin_oji.so" \
+ "$priority"
- # netscape
- netscape_dir="/usr/lib/netscape/plugins-libc6"
+ # mozilla
+ mozilla_dir="/usr/lib/mozilla/plugins"
- install_java_plugin "$netscape_dir" "libjavaplugin.so" \
- "netscape-javaplugin.so" \
- "$plugin_dir/libjavaplugin_oji.so" \
- "$priority"
+ install_java_plugin "$mozilla_dir" "libjavaplugin.so" \
+ "mozilla-javaplugin.so" \
+ "$plugin_dir/libjavaplugin_oji.so" \
+ "$priority"
- # mozilla
- mozilla_dir="/usr/lib/mozilla/plugins"
+ # mozilla-firefox
+ mozilla_firefox_dir="/usr/lib/mozilla-firefox/plugins"
- install_java_plugin "$mozilla_dir" "libjavaplugin.so" \
- "mozilla-javaplugin.so" \
- "$plugin_dir/libjavaplugin_oji.so" \
- "$priority"
+ install_java_plugin "$mozilla_firefox_dir" "libjavaplugin.so" \
+ "mozilla-firefox-javaplugin.so" \
+ "$plugin_dir/libjavaplugin_oji.so" \
+ "$priority"
- # mozilla-firefox
- mozilla_firefox_dir="/usr/lib/mozilla-firefox/plugins"
+ # firefox (1.5+)
+ firefox_dir="/usr/lib/firefox/plugins"
- install_java_plugin "$mozilla_firefox_dir" "libjavaplugin.so" \
- "mozilla-firefox-javaplugin.so" \
- "$plugin_dir/libjavaplugin_oji.so" \
- "$priority"
-
- # firefox (1.5+)
- firefox_dir="/usr/lib/firefox/plugins"
-
- install_java_plugin "$firefox_dir" "libjavaplugin.so"\
- "firefox-javaplugin.so" \
- "$plugin_dir/ns7/libjavaplugin_oji.so" \
- "$priority"
- fi
+ install_java_plugin "$firefox_dir" "libjavaplugin.so"\
+ "firefox-javaplugin.so" \
+ "$plugin_dir/ns7/libjavaplugin_oji.so" \
+ "$priority"
Modified: trunk/java-package/ibm-j2re1.5/remove
===================================================================
--- trunk/java-package/ibm-j2re1.5/remove 2006-05-04 02:30:20 UTC (rev 2104)
+++ trunk/java-package/ibm-j2re1.5/remove 2006-05-04 03:18:30 UTC (rev 2105)
@@ -28,25 +28,21 @@
program_alternative tnameserv
program_alternative unpack200
- # the plugin is only available for i386 architecture
- if [ $(dpkg --print-architecture) = i386 ] ; then
+ # assemble the plugin path
+ plugin_dir="$j2se_base/jre/bin"
- # assemble the plugin path
- plugin_dir="$j2se_base/jre/bin"
+ # netscape
+ remove_java_plugin "netscape-javaplugin.so" \
+ "$plugin_dir/libjavaplugin_oji.so"
- # netscape
- remove_java_plugin "netscape-javaplugin.so" \
- "$plugin_dir/libjavaplugin_oji.so"
+ # mozilla
+ remove_java_plugin "mozilla-javaplugin.so" \
+ "$plugin_dir/libjavaplugin_oji.so"
- # mozilla
- remove_java_plugin "mozilla-javaplugin.so" \
- "$plugin_dir/libjavaplugin_oji.so"
+ # mozilla-firefox (pre-1.5)
+ remove_java_plugin "mozilla-firefox-javaplugin.so"\
+ "$plugin_dir/libjavaplugin_oji.so"
- # mozilla-firefox (pre-1.5)
- remove_java_plugin "mozilla-firefox-javaplugin.so"\
- "$plugin_dir/libjavaplugin_oji.so"
- # firefox
- remove_java_plugin "firefox-javaplugin.so" \
- "$plugin_dir/libjavaplugin_oji.so"
-
- fi
+ # firefox
+ remove_java_plugin "firefox-javaplugin.so" \
+ "$plugin_dir/libjavaplugin_oji.so"
Modified: trunk/java-package/ibm-j2sdk1.5/install
===================================================================
--- trunk/java-package/ibm-j2sdk1.5/install 2006-05-04 02:30:20 UTC (rev 2104)
+++ trunk/java-package/ibm-j2sdk1.5/install 2006-05-04 03:18:30 UTC (rev 2105)
@@ -47,42 +47,37 @@
program_alternative serialver
program_alternative tnameserv
- # the plugin is only available for i386 architecture
+ # assemble the java plugin path
+ plugin_dir="$j2se_base/jre/bin"
- if [ $(dpkg-architecture -qDEB_BUILD_ARCH) = i386 ] ; then
-
- # assemble the java plugin path
- plugin_dir="$j2se_base/jre/bin"
-
- # netscape
- netscape_dir="/usr/lib/netscape/plugins-libc6"
+ # netscape
+ netscape_dir="/usr/lib/netscape/plugins-libc6"
- install_java_plugin "$netscape_dir" "libjavaplugin.so" \
- "netscape-javaplugin.so" \
- "$plugin_dir/libjavaplugin_oji.so" \
- "$priority"
+ install_java_plugin "$netscape_dir" "libjavaplugin.so" \
+ "netscape-javaplugin.so" \
+ "$plugin_dir/libjavaplugin_oji.so" \
+ "$priority"
- # mozilla
- mozilla_dir="/usr/lib/mozilla/plugins"
+ # mozilla
+ mozilla_dir="/usr/lib/mozilla/plugins"
- install_java_plugin "$mozilla_dir" "libjavaplugin.so" \
- "mozilla-javaplugin.so" \
- "$plugin_dir/libjavaplugin_oji.so" \
- "$priority"
+ install_java_plugin "$mozilla_dir" "libjavaplugin.so" \
+ "mozilla-javaplugin.so" \
+ "$plugin_dir/libjavaplugin_oji.so" \
+ "$priority"
- # mozilla-firefox (pre-1.5)
- mozilla_firefox_dir="/usr/lib/mozilla-firefox/plugins"
+ # mozilla-firefox (pre-1.5)
+ mozilla_firefox_dir="/usr/lib/mozilla-firefox/plugins"
- install_java_plugin "$mozilla_firefox_dir" "libjavaplugin.so" \
- "mozilla-firefox-javaplugin.so" \
- "$plugin_dir/libjavaplugin_oji.so" \
- "$priority"
+ install_java_plugin "$mozilla_firefox_dir" "libjavaplugin.so" \
+ "mozilla-firefox-javaplugin.so" \
+ "$plugin_dir/libjavaplugin_oji.so" \
+ "$priority"
- # firefox (1.5+)
- firefox_dir="/usr/lib/firefox/plugins"
+ # firefox (1.5+)
+ firefox_dir="/usr/lib/firefox/plugins"
- install_java_plugin "$firefox_dir" "libjavaplugin.so" \
- "firefox-javaplugin.so" \
- "$plugin_dir/ns7/libjavaplugin_oji.so" \
- "$priority"
- fi
+ install_java_plugin "$firefox_dir" "libjavaplugin.so" \
+ "firefox-javaplugin.so" \
+ "$plugin_dir/ns7/libjavaplugin_oji.so" \
+ "$priority"
Modified: trunk/java-package/ibm-j2sdk1.5/remove
===================================================================
--- trunk/java-package/ibm-j2sdk1.5/remove 2006-05-04 02:30:20 UTC (rev 2104)
+++ trunk/java-package/ibm-j2sdk1.5/remove 2006-05-04 03:18:30 UTC (rev 2105)
@@ -41,25 +41,21 @@
program_alternative serialver
program_alternative tnameserv
- # the plugin is only available for i386 architecture
- if [ $(dpkg --print-architecture) = i386 ] ; then
+ # assemble the plugin path
+ plugin_dir="$j2se_base/jre/bin"
- # assemble the plugin path
- plugin_dir="$j2se_base/jre/bin"
+ # netscape
+ remove_java_plugin "netscape-javaplugin.so" \
+ "$plugin_dir/libjavaplugin_oji.so"
- # netscape
- remove_java_plugin "netscape-javaplugin.so" \
- "$plugin_dir/libjavaplugin_oji.so"
-
- # mozilla
- remove_java_plugin "mozilla-javaplugin.so" \
- "$plugin_dir/libjavaplugin_oji.so"
+ # mozilla
+ remove_java_plugin "mozilla-javaplugin.so" \
+ "$plugin_dir/libjavaplugin_oji.so"
- # mozilla-firefox (pre-1.5)
- remove_java_plugin "mozilla-firefox-javaplugin.so" \
- "$plugin_dir/libjavaplugin_oji.so"
+ # mozilla-firefox (pre-1.5)
+ remove_java_plugin "mozilla-firefox-javaplugin.so" \
+ "$plugin_dir/libjavaplugin_oji.so"
- # firefox (1.5+)
- remove_java_plugin "firefox-javaplugin.so" \
- "$plugin_dir/libjavaplugin_oji.so"
- fi
+ # firefox (1.5+)
+ remove_java_plugin "firefox-javaplugin.so" \
+ "$plugin_dir/libjavaplugin_oji.so"
More information about the pkg-java-commits
mailing list