[pkg-java] r10534 - in trunk/java-package: debian lib

[Michael Koch]

Author: mkoch
Date: 2009-09-22 21:47:04 +0000 (Tue, 22 Sep 2009)
New Revision: 10534

Modified:
   trunk/java-package/debian/changelog
   trunk/java-package/lib/sun-j2re.sh
   trunk/java-package/lib/sun-j2sdk.sh
Log:

* Add support for Sun Java 6 Update XX (Closes: #514364).


Modified: trunk/java-package/debian/changelog
===================================================================
--- trunk/java-package/debian/changelog	2009-09-22 21:29:11 UTC (rev 10533)
+++ trunk/java-package/debian/changelog	2009-09-22 21:47:04 UTC (rev 10534)
@@ -1,6 +1,7 @@
 java-package (0.43) UNRELEASED; urgency=low
 
   * Remove Java plugins for all browsers (Closes: #367887).
+  * Add support for Sun Java 6 Update XX (Closes: #514364).
 
  -- Michael Koch <konqueror at gmx.de>  Thu, 17 Sep 2009 13:15:55 +0200
 

Modified: trunk/java-package/lib/sun-j2re.sh
===================================================================
--- trunk/java-package/lib/sun-j2re.sh	2009-09-22 21:29:11 UTC (rev 10533)
+++ trunk/java-package/lib/sun-j2re.sh	2009-09-22 21:47:04 UTC (rev 10534)
@@ -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)
@@ -69,6 +74,11 @@
 	    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

Modified: trunk/java-package/lib/sun-j2sdk.sh
===================================================================
--- trunk/java-package/lib/sun-j2sdk.sh	2009-09-22 21:29:11 UTC (rev 10533)
+++ trunk/java-package/lib/sun-j2sdk.sh	2009-09-22 21:47:04 UTC (rev 10534)
@@ -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)
@@ -98,6 +103,11 @@
 	    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