Bug#504778: java-package: No support for Java 6 update 10

[James Westby]

Hi,

Attached is the patch that I just wrote for Ubuntu. I believe it
takes care of all the cases. Someone with more scripting skills
may be able to reduce the duplication.

Thanks,

James


diff -Nru java-package-0.42/lib/sun-j2re.sh java-package-0.42ubuntu1/lib/sun-j2re.sh
--- java-package-0.42/lib/sun-j2re.sh	2008-03-21 16:18:03.000000000 +0000
+++ java-package-0.42ubuntu1/lib/sun-j2re.sh	2008-11-18 19:09:22.000000000 +0000
@@ -45,6 +45,11 @@
 	    j2se_expected_min_size=16 # 16542512 bytes
 	    found=true
 	    ;;
+	"jre-6u"[0-9][0-9]"-linux-i586.bin") # SUPPORTED
+	    j2se_version=1.6.0+update${archive_name:6:2}${revision}
+	    j2se_expected_min_size=16 # 16542512 bytes
+	    found=true
+	    ;;
       esac
       ;;
     amd64|x86_64-linux-gnu)
@@ -64,11 +69,21 @@
 	    j2se_expected_min_size=16 # 16542512 bytes
 	    found=true
 	    ;;
+	"jre-6u"[0-9][0-9]"-linux-amd64.bin") # SUPPORTED
+	    j2se_version=1.6.0+update${archive_name:6:2}${revision}
+	    j2se_expected_min_size=16 # 16542512 bytes
+	    found=true
+	    ;;
 	"jre-6u"[0-9]"-linux-x64.bin") # SUPPORTED
 	    j2se_version=1.6.0+update${archive_name:6:1}${revision}
 	    j2se_expected_min_size=16 # 16542512 bytes
 	    found=true
 	    ;;
+	"jre-6u"[0-9][0-9]"-linux-x64.bin") # SUPPORTED
+	    j2se_version=1.6.0+update${archive_name:6:2}${revision}
+	    j2se_expected_min_size=16 # 16542512 bytes
+	    found=true
+	    ;;
       esac
       ;;
   esac
diff -Nru java-package-0.42/lib/sun-j2sdk.sh java-package-0.42ubuntu1/lib/sun-j2sdk.sh
--- java-package-0.42/lib/sun-j2sdk.sh	2008-03-21 16:18:49.000000000 +0000
+++ java-package-0.42ubuntu1/lib/sun-j2sdk.sh	2008-11-18 19:10:34.000000000 +0000
@@ -50,6 +50,11 @@
 	    j2se_expected_min_size=130
 	    found=true
 	    ;;
+	"jdk-6u"[0-9][0-9]"-linux-i586.bin") # SUPPORTED
+	    j2se_version=1.6.0+update${archive_name:6:2}${revision}
+	    j2se_expected_min_size=130
+	    found=true
+	    ;;
       esac
       ;;
     ia64|ia64-linux-gnu)
@@ -93,11 +98,21 @@
 	    j2se_expected_min_size=130
 	    found=true
 	    ;;
+	"jdk-6u"[0-9][0-9]"-linux-amd64.bin") # SUPPORTED
+	    j2se_version=1.6.0+update${archive_name:6:2}${revision}
+	    j2se_expected_min_size=130
+	    found=true
+	    ;;
 	"jdk-6u"[0-9]"-linux-x64.bin") # SUPPORTED
 	    j2se_version=1.6.0+update${archive_name:6:1}${revision}
 	    j2se_expected_min_size=130
 	    found=true
 	    ;;
+	"jdk-6u"[0-9][0-9]"-linux-x64.bin") # SUPPORTED
+	    j2se_version=1.6.0+update${archive_name:6:2}${revision}
+	    j2se_expected_min_size=130
+	    found=true
+	    ;;
       esac
       ;;
   esac