CVS java-package/sun-j2sdk1.5

[Barry Hawkins]

Update of /cvsroot/pkg-java/java-package/sun-j2sdk1.5
In directory haydn:/tmp/cvs-serv18650/sun-j2sdk1.5

Modified Files:
	install remove 
Log Message:
Committed changes outlined in changelog entry for version 0.23.
Corrected formatting for control entry of package.


--- /cvsroot/pkg-java/java-package/sun-j2sdk1.5/install	2005/03/24 19:06:20	1.4
+++ /cvsroot/pkg-java/java-package/sun-j2sdk1.5/install	2005/04/01 07:44:17	1.5
@@ -31,8 +31,12 @@
 program_alternative rmiregistry
 program_alternative serialver
 
+# derive the architecture-specific 
+# directory for the plugin
+arch_dir="$(dpkg --print-architecture)"
 
-plugin_dir="$j2se_base/jre/plugin/i386"
+# assemble the plugin path
+plugin_dir="$j2se_base/plugin/$arch_dir"
 
 # netscape
 netscape_dir="/usr/lib/netscape/plugins-libc6"
--- /cvsroot/pkg-java/java-package/sun-j2sdk1.5/remove	2005/03/24 19:06:20	1.3
+++ /cvsroot/pkg-java/java-package/sun-j2sdk1.5/remove	2005/04/01 07:44:17	1.4
@@ -27,8 +27,12 @@
 program_alternative rmiregistry
 program_alternative serialver
 
+# derive the architecture-specific 
+# directory for the plugin
+arch_dir="$(dpkg --print-architecture)"
 
-plugin_dir="$j2se_base/jre/plugin/i386"
+# assemble the plugin path
+plugin_dir="$j2se_base/plugin/$arch_dir"
 
 # netscape
 update-alternatives \