CVS java-package/lib

[Jeroen van Wolffelaar]

Update of /cvsroot/pkg-java/java-package/lib
In directory haydn:/tmp/cvs-serv20043

Modified Files:
	sun-j2re.sh sun-j2sdk.sh 
Log Message:
Fix version ordering logic error on my part... stick to "+revision" style


--- /cvsroot/pkg-java/java-package/lib/sun-j2re.sh	2005/01/04 02:13:03	1.6
+++ /cvsroot/pkg-java/java-package/lib/sun-j2re.sh	2005/01/04 03:16:35	1.7
@@ -31,12 +31,12 @@
 	    found=true
 	    ;;
 	"jre-1_5_0-linux-i586.bin") # SUPPORTED
-	    j2se_version=1.5.0-00
+	    j2se_version=1.5.0+update00
 	    j2se_expected_min_size=85 # 86832 kB
 	    found=true
 	    ;;
 	"jre-1_5_0_"[0-9][0-9]"-linux-i586.bin") # SUPPORTED
-	    j2se_version=1.5.0-${archive_name:10:2}
+	    j2se_version=1.5.0+update${archive_name:10:2}
 	    j2se_expected_min_size=80
 	    found=true
 	    ;;
@@ -45,12 +45,12 @@
     "x86_64-linux")
       case "$archive_name" in
 	"jre-1_5_0-linux-amd64.bin") # SUPPORTED
-	    j2se_version=1.5.0-00
+	    j2se_version=1.5.0+update00
 	    j2se_expected_min_size=65 # 69936 kB
 	    found=true
 	    ;;
 	"jre-1_5_0_"[0-9][0-9]"-linux-amd64.bin") # SUPPORTED
-	    j2se_version=1.5.0-${archive_name:10:2}
+	    j2se_version=1.5.0+update${archive_name:10:2}
 	    j2se_expected_min_size=60 # 69936 kB
 	    found=true
 	    ;;
--- /cvsroot/pkg-java/java-package/lib/sun-j2sdk.sh	2005/01/03 20:48:37	1.5
+++ /cvsroot/pkg-java/java-package/lib/sun-j2sdk.sh	2005/01/04 03:16:36	1.6
@@ -31,12 +31,12 @@
 	    found=true
 	    ;;
 	"jdk-1_5_0-linux-i586.bin") # SUPPORTED
-	    j2se_version=1.5.0-00
+	    j2se_version=1.5.0+update00
 	    j2se_expected_min_size=134 # 136608 kB
 	    found=true
 	    ;;
 	"jdk-1_5_0_"[0-9][0-9]"-linux-i586.bin") # SUPPORTED
-	    j2se_version=1.5.0-${archive_name:10:2}
+	    j2se_version=1.5.0+update${archive_name:10:2}
 	    j2se_expected_min_size=130
 	    found=true
 	    ;;
@@ -64,12 +64,12 @@
 	    found=true
 	    ;;
 	"jdk-1_5_0-linux-amd64.bin") # SUPPORTED
-	    j2se_version=1.5.0-00
+	    j2se_version=1.5.0+update00
 	    j2se_expected_min_size=110 # 112940 kB
 	    found=true
 	    ;;
 	"jdk-1_5_0"[0-9][0-9]"-linux-amd64.bin") # SUPPORTED
-	    j2se_version=1.5.0-${archive_name:10:2}
+	    j2se_version=1.5.0+update${archive_name:10:2}
 	    j2se_expected_min_size=105
 	    found=true
 	    ;;