Bug#597294: java-package: Failed with Sun's JDK with a 2 digits update version (ie, 6u21)

[dan]

Package: java-package
Version: 0.42
Severity: important


In this version make-jpkg doesn't handle Oracle/Sun's JDK archives with
a 2 digits long update number, like in 'jdk-6u21-linux-i586.bin'.

The following patch fix this:

---cut---
--- /usr/share/java-package/sun-j2sdk.sh.orig	2010-09-18
15:15:52.380343347 +0200
+++ /usr/share/java-package/sun-j2sdk.sh	2010-09-18 15:06:49.200324827 +0200
@@ -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
---cut---

cheers,
dan

-- System Information:
Debian Release: 5.0.6
  APT prefers stable
  APT policy: (500, 'stable')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.32-bpo.5-vserver-amd64 (SMP w/4 CPU cores)
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash