CVS java-package/lib
Jeroen van Wolffelaar
jeroen@haydn.debian.org
Mon Jan 3 12:25:08 2005
Update of /cvsroot/pkg-java/java-package/lib
In directory haydn:/tmp/cvs-serv26116/lib
Modified Files:
sun-j2re.sh sun-j2sdk.sh
Log Message:
Added support for Sun's JDK/JRE 1.5 patch levels, based on a patch by
Peter Marschall <peter@adpm.de> (Closes: #286718, #287857)
--- /cvsroot/pkg-java/java-package/lib/sun-j2re.sh 2005/01/03 17:31:54 1.3
+++ /cvsroot/pkg-java/java-package/lib/sun-j2re.sh 2005/01/03 19:24:25 1.4
@@ -31,19 +31,29 @@
found=true
;;
"jre-1_5_0-linux-i586.bin")
- j2se_version=1.5.0+final
+ j2se_version=1.5.0-00
j2se_expected_min_size=85 # 86832 kB
found=true
;;
+ "jre-1_5_0_"[0-9][0-9]"-linux-i586.bin")
+ j2se_version=1.5.0-${archive_name:10:2}
+ j2se_expected_min_size=80
+ found=true
+ ;;
esac
;;
"x86_64-linux")
case "$archive_name" in
"jre-1_5_0-linux-amd64.bin")
- j2se_version=1.5.0+final
+ j2se_version=1.5.0-00
j2se_expected_min_size=68 # 69936 kB
found=true
;;
+ "jre-1_5_0_"[0-9][0-9]"-linux-amd64.bin")
+ j2se_version=1.5.0-${archive_name:10:2}
+ j2se_expected_min_size=60 # 69936 kB
+ found=true
+ ;;
esac
;;
esac
--- /cvsroot/pkg-java/java-package/lib/sun-j2sdk.sh 2005/01/03 17:31:54 1.3
+++ /cvsroot/pkg-java/java-package/lib/sun-j2sdk.sh 2005/01/03 19:24:25 1.4
@@ -31,10 +31,15 @@
found=true
;;
"jdk-1_5_0-linux-i586.bin")
- j2se_version=1.5.0+final
+ j2se_version=1.5.0-00
j2se_expected_min_size=134 # 136608 kB
found=true
;;
+ "jdk-1_5_0_"[0-9][0-9]"-linux-i586.bin")
+ j2se_version=1.5.0-${archive_name:10:2}
+ j2se_expected_min_size=130
+ found=true
+ ;;
esac
;;
"ia64-linux")
@@ -59,10 +64,15 @@
found=true
;;
"jdk-1_5_0-linux-amd64.bin")
- j2se_version=1.5.0+final
+ j2se_version=1.5.0-00
j2se_expected_min_size=110 # 112940 kB
found=true
;;
+ "jdk-1_5_0"[0-9][0-9]"-linux-amd64.bin")
+ j2se_version=1.5.0-${archive_name:10:2}
+ j2se_expected_min_size=105
+ found=true
+ ;;
esac
;;
esac