Correct handling of amd64 in roacle-jdk6.1->4 and improve error message when used...

diff --git a/debian/changelog b/debian/changelog
index a7f6d49b1ffcbf898a5c7af414fad0502c58f738..527516cf97c279587db6a0932f96e878a20d8030 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ java-package (0.51) unstable; urgency=low
   * Add java6-{runtime|sdk|...} to the provides line in generated packages Closes: #684993
   * Add java6-{runtime|sdk|...} to the provides line in generated packages Closes: #684993
   * Drop installation debconf note Closes: #685082
+  * Correct handling of amd64 in roacle-jdk6.1->4 and improve error message when used with unknown archives
 
   [Emmanuel Bourg]
   * Improved detection of the JRE/JDK version (supports 2 digits Java 7 updates)

diff --git a/lib/oracle-j2re.sh b/lib/oracle-j2re.sh
index 4532c07a6dd6ef5dc5daf722e97e6c1806338773..a7b6207e82d6a6def7172c122c4a8fcefdf41d0d 100644 (file)
--- a/lib/oracle-j2re.sh
+++ b/lib/oracle-j2re.sh
@@ -2,7 +2,7 @@
 j2se_detect_oracle_j2re=oracle_j2re_detect
 oracle_j2re_detect() {
 
-  if [[ $archive_name =~ jre-([0-9]+)u([0-9]+)-linux-(i586|x64)\.(bin|tar\.gz) ]]
+  if [[ $archive_name =~ jre-([0-9]+)u([0-9]+)-linux-(i586|x64|amd64)\.(bin|tar\.gz) ]]
   then
     j2se_release=${BASH_REMATCH[1]}
     j2se_update=${BASH_REMATCH[2]}
@@ -19,7 +19,7 @@ oracle_j2re_detect() {
         if [[ "$j2se_arch" != "i586" ]]; then compatible=0; fi
         ;;
       amd64|x86_64-linux-gnu)
-        if [[ "$j2se_arch" != "x64" ]]; then compatible=0; fi
+        if [[ "$j2se_arch" != "x64" && "$j2se_arch" != "amd64" ]]; then compatible=0; fi
         ;;
     esac
 

diff --git a/lib/oracle-j2sdk.sh b/lib/oracle-j2sdk.sh
index 091a0cbf97737bdd8af4f31b475d243e6f2eaa69..16db30e12feb53adb1f4ac3d3dac58c3069eb709 100644 (file)
--- a/lib/oracle-j2sdk.sh
+++ b/lib/oracle-j2sdk.sh
@@ -2,7 +2,7 @@
 j2se_detect_oracle_j2sdk=oracle_j2sdk_detect
 oracle_j2sdk_detect() {
 
-  if [[ $archive_name =~ jdk-([0-9]+)u([0-9]+)-linux-(i586|x64)\.(bin|tar\.gz) ]]
+  if [[ $archive_name =~ jdk-([0-9]+)u([0-9]+)-linux-(i586|x64|amd64)\.(bin|tar\.gz) ]]
   then
     j2se_release=${BASH_REMATCH[1]}
     j2se_update=${BASH_REMATCH[2]}
@@ -19,7 +19,7 @@ oracle_j2sdk_detect() {
         if [[ "$j2se_arch" != "i586" ]]; then compatible=0; fi
         ;;
       amd64|x86_64-linux-gnu)
-        if [[ "$j2se_arch" != "x64" ]]; then compatible=0; fi
+        if [[ "$j2se_arch" != "x64" && "$j2se_arch" != "amd64" ]]; then compatible=0; fi
         ;;
     esac
 

diff --git a/make-jpkg b/make-jpkg
index 41899db7a342d44f64d24cee99846b602abceae0..4c542db0f2989f589426c9fc6cdafa2d5a6289bb 100755 (executable)
--- a/make-jpkg
+++ b/make-jpkg
@@ -232,7 +232,7 @@ done
 echo
 
 if [[ -z "$j2se_found" ]]; then
-    echo "No matching plugin was found."
+    echo "No matching packaging method was found for $archive_name. Please make sure you are using a tar.gz or self-extracting archive"
 fi