Bug#274844: java-package 0.14 updates for amd64, i386 and ia64
Kaare Hviid
Kaare Hviid <ukh@id.cbs.dk>, 274844@bugs.debian.org
Wed Oct 27 04:54:01 2004
Does this look reasonable? I've added detection for Blackdown 1.4.2 fcs
(released on the 28th of September) for i386 and amd64, Sun 1.5.0 final
for i386 and amd64, as well as Sun JDK 1.4.2 ia64, incorporating
suggestions in #277088, #274399, #275870 and #271846. One should
probably also fix support for Blackdown 1.4.1 on sparc, and possibly
also Blackdown 1.3.1 on arm, ppc and sparc, but I simply lack the
resources to test it at all.
This patch is against vanilla java-package 0.14:
diff -Naur java-package-0.14/lib/blackdown-j2re.sh java-package-0.14.fixed/lib/blackdown-j2re.sh
--- java-package-0.14/lib/blackdown-j2re.sh 2004-09-13 08:20:51.000000000 +0200
+++ java-package-0.14.fixed/lib/blackdown-j2re.sh 2004-10-27 11:10:45.000000000 +0200
@@ -1,7 +1,10 @@
# Detect product
function blackdown_j2re_detect() {
- local found=
- case "$archive_name" in
+ local found=
+ eval $(dpkg-architecture)
+ case "$DEB_BUILD_GNU_TYPE" in
+ "i386-linux")
+ case "$archive_name" in
"j2re-1.3.1-02b-FCS-linux-i386.bin")
j2se_version=1.3.1+02b
j2se_expected_min_size=35 # 35882 kB
@@ -27,8 +30,34 @@
j2se_expected_min_size=48 # 49988 kB
found=true
;;
- esac
- if [[ -n "$found" ]]; then
+ "j2re-1.4.2-fcs-linux-i586-gcc2.95.bin")
+ j2se_version=1.4.2
+ j2se_expected_min_size=56 # 58044 kB
+ found=true
+ ;;
+ "j2re-1.4.2-fcs-linux-i586-gcc3.2.bin")
+ j2se_version=1.4.2
+ j2se_expected_min_size=54 # 55524 kB
+ found=true
+ ;;
+ esac
+ ;;
+ "x86_64-linux")
+ case "$archive_name" in
+ "j2re-1.4.2-rc1-linux-amd64.bin")
+ j2se_version=1.4.2+rc1
+ j2se_expected_min_size=53 # 54748 kB
+ found=true
+ ;;
+ "j2re-1.4.2-fcs-linux-amd64.bin")
+ j2se_version=1.4.2
+ j2se_expected_min_size=54 # 55468 kB
+ found=true
+ ;;
+ esac
+ ;;
+ esac
+ if [[ -n "$found" ]]; then
cat << EOF
Detected product:
diff -Naur java-package-0.14/lib/blackdown-j2sdk.sh java-package-0.14.fixed/lib/blackdown-j2sdk.sh
--- java-package-0.14/lib/blackdown-j2sdk.sh 2004-09-13 08:21:19.000000000 +0200
+++ java-package-0.14.fixed/lib/blackdown-j2sdk.sh 2004-10-27 11:54:07.000000000 +0200
@@ -1,7 +1,10 @@
# Detect product
function blackdown_j2sdk_detect() {
- local found=
- case "$archive_name" in
+ local found=
+ eval $(dpkg-architecture)
+ case "$DEB_BUILD_GNU_TYPE" in
+ "i386-linux")
+ case "$archive_name" in
"j2sdk-1.3.1-02b-FCS-linux-i386.bin")
j2se_version=1.3.1+02b
j2se_expected_min_size=52 # 54083 kB
@@ -27,9 +30,35 @@
j2se_expected_min_size=76 # 78055 kB
found=true
;;
- esac
- if [[ -n "$found" ]]; then
- cat << EOF
+ "j2sdk-1.4.2-fcs-linux-i586-gcc2.95.bin")
+ j2se_version=1.4.2
+ j2se_expected_min_size=90 # 92740 kB
+ found=true
+ ;;
+ "j2sdk-1.4.2-fcs-linux-i586-gcc3.2.bin")
+ j2se_version=1.4.2
+ j2se_expected_min_size=88 # 90316 kB
+ found=true
+ ;;
+ esac
+ ;;
+ "x86_64-linux")
+ case "$archive_name" in
+ "j2sdk-1.4.2-rc1-linux-amd64.bin")
+ j2se_version=1.4.2+rc1
+ j2se_expected_min_size=86 # 88556 kB
+ found=true
+ ;;
+ "j2sdk-1.4.2-fcs-linux-amd64.bin")
+ j2se_version=1.4.2
+ j2se_expected_min_size=89 # 91460 kB
+ found=true
+ ;;
+ esac
+ ;;
+ esac
+ if [[ -n "$found" ]]; then
+ cat << EOF
Detected product:
Java(TM) Software Development Kit (J2SDK)
diff -Naur java-package-0.14/lib/sun-j2re.sh java-package-0.14.fixed/lib/sun-j2re.sh
--- java-package-0.14/lib/sun-j2re.sh 2004-07-18 05:36:11.000000000 +0200
+++ java-package-0.14.fixed/lib/sun-j2re.sh 2004-10-27 10:40:24.000000000 +0200
@@ -1,7 +1,10 @@
# Detect product
function sun_j2re_detect() {
- local found=
- case "$archive_name" in
+local found=
+ eval $(dpkg-architecture)
+ case "$DEB_BUILD_GNU_TYPE" in
+ "i386-linux")
+ case "$archive_name" in
"j2re-1_3_1_"[0-9][0-9]"-linux-i586.bin")
j2se_version="1.3.1+${archive_name:11:2}"
j2se_expected_min_size=38 # 39089 kB
@@ -22,8 +25,24 @@
j2se_expected_min_size=81 # 83267 kB
found=true
;;
- esac
- if [[ -n "$found" ]]; then
+ "jre-1_5_0-linux-i586.bin")
+ j2se_version=1.5.0
+ j2se_expected_min_size=85 # 87420 kB
+ found=true
+ ;;
+ esac
+ ;;
+ "x86_64-linux")
+ case "$archive_name" in
+ "jre-1_5_0-linux-amd64.bin")
+ j2se_version=1.5.0
+ j2se_expected_min_size=68 # 69936 kB
+ found=true
+ ;;
+ esac
+ ;;
+ esac
+ if [[ -n "$found" ]]; then
cat << EOF
Detected product:
diff -Naur java-package-0.14/lib/sun-j2sdk.sh java-package-0.14.fixed/lib/sun-j2sdk.sh
--- java-package-0.14/lib/sun-j2sdk.sh 2004-07-18 05:46:51.000000000 +0200
+++ java-package-0.14.fixed/lib/sun-j2sdk.sh 2004-10-27 10:53:36.000000000 +0200
@@ -1,7 +1,10 @@
# Detect product
function sun_j2sdk_detect() {
- local found=
- case "$archive_name" in
+ local found=
+ eval $(dpkg-architecture)
+ case "$DEB_BUILD_GNU_TYPE" in
+ "i386-linux")
+ case "$archive_name" in
"j2sdk-1_3_1_"[0-9][0-9]"-linux-i586.bin")
j2se_version="1.3.1+${archive_name:12:2}"
j2se_expected_min_size=54 # 56259 kB
@@ -27,8 +30,33 @@
j2se_expected_min_size=122 # 125899 kB
found=true
;;
- esac
- if [[ -n "$found" ]]; then
+ "jdk-1_5_0-linux-i586.bin")
+ j2se_version=1.5.0
+ j2se_expected_min_size=136 # 159648 kB
+ found=true
+ ;;
+ esac
+ ;;
+ "ia64-linux")
+ case "$archive_name" in
+ "j2sdk-1_4_2_"[0-9][0-9]"-linux-ia64.bin")
+ j2se_version="1.4.2+${archive_name:12:2}"
+ j2se_expected_min_size=107 # 109256 kB
+ found=true
+ ;;
+ esac
+ ;;
+ "x86_64-linux")
+ case "$archive_name" in
+ "jdk-1_5_0-linux-amd64.bin")
+ j2se_version=1.5.0
+ j2se_expected_min_size=110 # 112940 kB
+ found=true
+ ;;
+ esac
+ ;;
+ esac
+ if [[ -n "$found" ]]; then
cat << EOF
Detected product:
--
Kåre Hviid ukh@id.cbs.dk +45 3815 3075
Sys Admin Institut for Datalingvistik, Handelshøjskolen i København