CVS java-package/lib
Jeroen van Wolffelaar
jeroen@haydn.debian.org
Sat Jul 9 12:34:08 2005
Update of /cvsroot/pkg-java/java-package/lib
In directory haydn:/tmp/cvs-serv7630/lib
Modified Files:
blackdown-j2re.sh blackdown-j2sdk.sh ibm-j2re.sh ibm-j2sdk.sh
sun-j2re.sh sun-j2sdk.sh
Log Message:
* Cope with dpkg's new way of expressing architectures (Closes: #313555)
--- /cvsroot/pkg-java/java-package/lib/blackdown-j2re.sh 2005/04/01 07:44:13 1.8
+++ /cvsroot/pkg-java/java-package/lib/blackdown-j2re.sh 2005/07/09 12:33:37 1.9
@@ -2,8 +2,8 @@
function blackdown_j2re_detect() {
local found=
eval $(dpkg-architecture)
- case "$DEB_BUILD_GNU_TYPE" in
- "i386-linux")
+ case "${DEB_BUILD_ARCH:-$DEB_BUILD_GNU_TYPE}" in
+ i386|i386-linux)
case "$archive_name" in
"j2re-1.3.1-02b-FCS-linux-i386.bin") # SUPPORTED
j2se_version=1.3.1+02a
@@ -52,7 +52,7 @@
;;
esac
;;
- "sparc-linux")
+ sparc|sparc-linux)
case "$archive_name" in
"j2re-1.3.1-02b-FCS-linux-sparc.bin") # SUPPORTED
j2se_version=1.3.1+02b
@@ -66,7 +66,7 @@
;;
esac
;;
- "x86_64-linux")
+ amd64|x86_64-linux)
case "$archive_name" in
"j2re-1.4.2-rc1-linux-amd64.bin") # SUPPORTED
j2se_version=1.4.2+rc1
@@ -85,7 +85,7 @@
;;
esac
;;
- "powerpc-linux")
+ powerpc|powerpc-linux)
case "$archive_name" in
"j2re-1.3.1-14-FCS-linux-ppc.bin") # SUPPORTED
j2se_version=1.3.1
--- /cvsroot/pkg-java/java-package/lib/blackdown-j2sdk.sh 2005/04/01 07:44:13 1.8
+++ /cvsroot/pkg-java/java-package/lib/blackdown-j2sdk.sh 2005/07/09 12:33:37 1.9
@@ -2,8 +2,8 @@
function blackdown_j2sdk_detect() {
local found=
eval $(dpkg-architecture)
- case "$DEB_BUILD_GNU_TYPE" in
- "i386-linux")
+ case "${DEB_BUILD_ARCH:-$DEB_BUILD_GNU_TYPE}" in
+ i386|i386-linux)
case "$archive_name" in
"j2sdk-1.3.1-02a-FCS-linux-i386.bin") # SUPPORTED
j2se_version=1.3.1+02a
@@ -52,7 +52,7 @@
;;
esac
;;
- "sparc-linux")
+ sparc|sparc-linux)
case "$archive_name" in
"j2sdk-1.3.1-02b-FCS-linux-sparc.bin") # SUPPORTED
j2se_version=1.3.1+02b
@@ -66,7 +66,7 @@
;;
esac
;;
- "x86_64-linux")
+ amd64|x86_64-linux)
case "$archive_name" in
"j2sdk-1.4.2-rc1-linux-amd64.bin") # SUPPORTED
j2se_version=1.4.2+rc1
@@ -85,7 +85,7 @@
;;
esac
;;
- "powerpc-linux")
+ powerpc|powerpc-linux)
case "$archive_name" in
"j2sdk-1.3.1-14-FCS-linux-ppc.bin") # SUPPORTED
j2se_version=1.3.1
--- /cvsroot/pkg-java/java-package/lib/ibm-j2re.sh 2005/03/24 04:53:29 1.3
+++ /cvsroot/pkg-java/java-package/lib/ibm-j2re.sh 2005/07/09 12:33:37 1.4
@@ -2,8 +2,8 @@
function ibm_j2re_detect() {
local found=
eval $(dpkg-architecture)
- case "$DEB_BUILD_GNU_TYPE" in
- "i386-linux")
+ case "${DEB_BUILD_ARCH:-$DEB_BUILD_GNU_TYPE}" in
+ i386|i386-linux)
case "$archive_name" in
"IBMJava2-JRE-131.tgz") # SUPPORTED
j2se_version=1.3.1
@@ -17,7 +17,7 @@
;;
esac
;;
- "x86_64-linux")
+ amd64|x86_64-linux)
case "$archive_name" in
"IBMJava2-JRE-AMD64-142.x86_64.tgz") # SUPPORTED
j2se_version=1.4.2
@@ -26,7 +26,7 @@
;;
esac
;;
- "s390-linux")
+ s390|s390-linux)
case "$archive_name" in
"IBMJava2-JRE-131.s390.tgz") # SUPPORTED
j2se_version=1.3.1
@@ -50,7 +50,7 @@
;;
esac
;;
- "powerpc-linux")
+ powerpc|powerpc-linux)
case "$archive_name" in
"IBMJava2-JRE-131.ppc.tgz") # SUPPORTED
j2se_version=1.3.1
@@ -64,7 +64,7 @@
;;
esac
;;
- "powerpc64-linux")
+ powerpc64|powerpc64-linux)
case "$archive_name" in
"IBMJava2-JRE-142.ppc64.tgz") # SUPPORTED
j2se_version=1.4.2
--- /cvsroot/pkg-java/java-package/lib/ibm-j2sdk.sh 2005/03/24 04:53:29 1.4
+++ /cvsroot/pkg-java/java-package/lib/ibm-j2sdk.sh 2005/07/09 12:33:37 1.5
@@ -2,8 +2,8 @@
function ibm_j2sdk_detect() {
local found=
eval $(dpkg-architecture)
- case "$DEB_BUILD_GNU_TYPE" in
- "i386-linux")
+ case "${DEB_BUILD_ARCH:-$DEB_BUILD_GNU_TYPE}" in
+ i386|i386-linux)
case "$archive_name" in
"IBMJava2-SDK-131.tgz") # SUPPORTED
j2se_version=1.3.1
@@ -17,7 +17,7 @@
;;
esac
;;
- "x86_64-linux")
+ amd64|x86_64-linux)
case "$archive_name" in
"IBMJava2-SDK-AMD64-142.x86_64.tgz") # SUPPORTED
j2se_version=1.4.2
@@ -26,7 +26,7 @@
;;
esac
;;
- "powerpc-linux")
+ amd64|x86_64-linux)
case "$archive_name" in
"IBMJava2-SDK-131.ppc.tgz") # SUPPORTED
j2se_version=1.3.1
@@ -45,7 +45,7 @@
;;
esac
;;
- "powerpc64-linux")
+ powerpc64|powerpc64-linux)
case "$archive_name" in
"IBMJava2-SDK-142.ppc64.tgz") # SUPPORTED
j2se_version=1.4.2
@@ -54,7 +54,7 @@
;;
esac
;;
- "s390-linux")
+ s390|s390-linux)
case "$archive_name" in
"IBMJava2-SDK-142.s390.tgz") # SUPPORTED
j2se_version=1.4.2
--- /cvsroot/pkg-java/java-package/lib/sun-j2re.sh 2005/01/24 23:07:44 1.8
+++ /cvsroot/pkg-java/java-package/lib/sun-j2re.sh 2005/07/09 12:33:37 1.9
@@ -2,8 +2,8 @@
function sun_j2re_detect() {
local found=
eval $(dpkg-architecture)
- case "$DEB_BUILD_GNU_TYPE" in
- "i386-linux")
+ case "${DEB_BUILD_ARCH:-$DEB_BUILD_GNU_TYPE}" in
+ i386|i386-linux)
case "$archive_name" in
"j2re-1_4_1_"[0-9][0-9]"-linux-i586.bin") # SUPPORTED
j2se_version="1.4.1+${archive_name:11:2}"
@@ -37,7 +37,7 @@
;;
esac
;;
- "x86_64-linux")
+ amd64|x86_64-linux)
case "$archive_name" in
"jre-1_5_0-linux-amd64.bin") # SUPPORTED
j2se_version=1.5.0+update00
--- /cvsroot/pkg-java/java-package/lib/sun-j2sdk.sh 2005/01/24 23:07:44 1.7
+++ /cvsroot/pkg-java/java-package/lib/sun-j2sdk.sh 2005/07/09 12:33:37 1.8
@@ -2,8 +2,8 @@
function sun_j2sdk_detect() {
local found=
eval $(dpkg-architecture)
- case "$DEB_BUILD_GNU_TYPE" in
- "i386-linux")
+ case "${DEB_BUILD_ARCH:-$DEB_BUILD_GNU_TYPE}" in
+ i386|i386-linux)
case "$archive_name" in
"j2sdk-1_4_1_"[0-9][0-9]"-linux-i586.bin") # SUPPORTED
j2se_version="1.4.1+${archive_name:12:2}"
@@ -51,7 +51,7 @@
;;
esac
;;
- "x86_64-linux")
+ amd64|x86_64-linux)
case "$archive_name" in
"jdk-1_5_0-beta2-linux-amd64.bin") # SUPPORTED
j2se_version=1.5.0+beta2