CVS java-package/ibm-j2re1.4

[Barry Hawkins]

Update of /cvsroot/pkg-java/java-package/ibm-j2re1.4
In directory haydn:/tmp/cvs-serv3039/ibm-j2re1.4

Modified Files:
	install remove 
Log Message:
Update of Blackdown and IBM JRE/JDK alternatives install scripts.

--- /cvsroot/pkg-java/java-package/ibm-j2re1.4/install	2005/11/06 20:12:17	1.4
+++ /cvsroot/pkg-java/java-package/ibm-j2re1.4/install	2005/11/07 04:36:11	1.5
@@ -1,4 +1,4 @@
-suffix=j2re1.4-ibm
+suffix=j2re1.4-ibm/jre
 j2se_base="/usr/lib/$suffix"
 priority=314
 
@@ -6,6 +6,9 @@
     exit 0
 fi
 
+# Append JRE directory for alternatives installation
+j2se_base=$j2se_base/jre
+
 # alternative <program>
 function program_alternative() {
     local program="$1"
@@ -14,10 +17,18 @@
         "$j2se_base/bin/$program" "$priority"
 }
 
+# kinit, klist, and ktab not installed at this
+# time; handling of /etc/krb5.conf not addressed
+program_alternative ikeyman
 program_alternative java
+program_alternative JavaPluginControlPanel
 program_alternative javaw
+program_alternative jextract
+program_alternative keytool
+program_alternative policytool
 program_alternative rmid
 program_alternative rmiregistry
+program_alternative tnameserv
 
 # the plugin is only available for i386 architecture
 
--- /cvsroot/pkg-java/java-package/ibm-j2re1.4/remove	2005/11/06 20:12:17	1.4
+++ /cvsroot/pkg-java/java-package/ibm-j2re1.4/remove	2005/11/07 04:36:11	1.5
@@ -5,6 +5,9 @@
     exit 0
 fi
 
+# Append JRE directory for alternatives installation
+j2se_base=$j2se_base/jre
+
 # alternative <program>
 function program_alternative() {
     local program="$1"
@@ -12,10 +15,16 @@
         --remove "$program" "$j2se_base/bin/$program"
 }
 
+program_alternative ikeyman
 program_alternative java
+program_alternative JavaPluginControlPanel
 program_alternative javaw
+program_alternative jextract
+program_alternative keytool
+program_alternative policytool
 program_alternative rmid
 program_alternative rmiregistry
+program_alternative tnameserv
 
 # the plugin is only available for i386 architecture
 if [ $(dpkg --print-architecture) = i386 ] ; then