Added support for early access releases (Closes: #721136)

diff --git a/debian/changelog b/debian/changelog
index 95bc4875140b01f5c8df9737c23d8374924e594b..778bb8bb1e08b4a1e897a40b9cd6bf69adcbbab6 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+java-package (0.53) UNRELEASED; urgency=low
+
+  * Team upload.
+  * Added support for early access releases (Closes: #721136)
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Wed, 28 Aug 2013 19:34:41 +0200
+
 java-package (0.52) unstable; urgency=low
 
   [ Sylvestre Ledru ]

diff --git a/lib/oracle-jdk.sh b/lib/oracle-jdk.sh
index fecb29684d92820387131b1d10944970b5ce036c..0f422656c90de667f8a4eac7f6780d8654cc027f 100644 (file)
--- a/lib/oracle-jdk.sh
+++ b/lib/oracle-jdk.sh
@@ -1,19 +1,36 @@
 # Detect product
 j2se_detect_oracle_j2sdk=oracle_j2sdk_detect
 oracle_j2sdk_detect() {
+  j2se_release=0
 
+  # Update (jdk-7u15-linux-i586.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]}
     j2se_arch=${BASH_REMATCH[3]}
+    j2se_type="Update"
     j2se_version=${j2se_release}u${j2se_update}
+  fi
+
+  # Early Access Release (jdk-8-ea-bin-b103-linux-i586-15_aug_2013.tar.gz)
+  if [[ $archive_name =~ jdk-([0-9]+)-ea-bin-(b[0-9]+)-linux-(i586|x64|amd64).*\.(bin|tar\.gz) ]]
+  then
+    j2se_release=${BASH_REMATCH[1]}
+    j2se_update=${BASH_REMATCH[2]}
+    j2se_arch=${BASH_REMATCH[3]}
+    j2se_type="Early Access Release"
+    j2se_version=${j2se_release}~ea-build-${j2se_update}
+  fi
+
+  if [[ $j2se_release > 0 ]]
+  then
     j2se_priority=$((310 + $j2se_release))
     j2se_expected_min_size=130 #Mb
 
     # check if the architecture matches
     let compatible=1
-  
+
     case "${DEB_BUILD_ARCH:-$DEB_BUILD_GNU_TYPE}" in
       i386|i486-linux-gnu)
         if [[ "$j2se_arch" != "i586" ]]; then compatible=0; fi
@@ -50,7 +67,7 @@ oracle_j2sdk_detect() {
 
 Detected product:
     Java(TM) Development Kit (JDK)
-    Standard Edition, Version $j2se_release Update $j2se_update
+    Standard Edition, Version $j2se_release $j2se_type $j2se_update
     Oracle(TM)
 EOF
     if read_yn "Is this correct [Y/n]: "; then

diff --git a/lib/oracle-jre.sh b/lib/oracle-jre.sh
index 04c47e6e21de163191d302d014b3be340fd8143e..7bd2b66f12b3e7f7ba1e16c5eedb0a6504f84f51 100644 (file)
--- a/lib/oracle-jre.sh
+++ b/lib/oracle-jre.sh
@@ -1,19 +1,36 @@
 # Detect product
 j2se_detect_oracle_j2re=oracle_j2re_detect
 oracle_j2re_detect() {
+  j2se_release=0
 
+  # Update (jre-7u13-linux-x64.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]}
     j2se_arch=${BASH_REMATCH[3]}
+    j2se_type="Update"
     j2se_version=${j2se_release}u${j2se_update}
+  fi
+
+  # Early Access Release (jre-8-ea-bin-b103-linux-x64-15_aug_2013.tar.gz)
+  if [[ $archive_name =~ jre-([0-9]+)-ea-bin-(b[0-9]+)-linux-(i586|x64|amd64).*\.(bin|tar\.gz) ]]
+  then
+    j2se_release=${BASH_REMATCH[1]}
+    j2se_update=${BASH_REMATCH[2]}
+    j2se_arch=${BASH_REMATCH[3]}
+    j2se_type="Early Access Release"
+    j2se_version=${j2se_release}~ea-build-${j2se_update}
+  fi
+
+  if [[ $j2se_release > 0 ]]
+  then
     j2se_priority=$((310 + $j2se_release - 1))
     j2se_expected_min_size=85 #Mb
 
     # check if the architecture matches
     let compatible=1
-  
+
     case "${DEB_BUILD_ARCH:-$DEB_BUILD_GNU_TYPE}" in
       i386|i486-linux-gnu)
         if [[ "$j2se_arch" != "i586" ]]; then compatible=0; fi
@@ -34,7 +51,7 @@ oracle_j2re_detect() {
 
 Detected product:
     Java(TM) Runtime Environment (JRE)
-    Standard Edition, Version $j2se_release Update $j2se_update
+    Standard Edition, Version $j2se_release $j2se_type $j2se_update
     Oracle(TM)
 EOF
     if read_yn "Is this correct [Y/n]: "; then