Fixed the detection of the latest Java 8 documentation archives

diff --git a/debian/changelog b/debian/changelog
index 9a22c8b7ad23d7ffb272a240a92fe40e731f2d82..3a0f03fcaa3e3c3f74d996c549a9f0879e3def58 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ java-package (0.60) UNRELEASED; urgency=medium
 
   [ Emmanuel Bourg ]
   * Added jcontrol to the command line alternatives (Closes: #799370)
 
   [ Emmanuel Bourg ]
   * Added jcontrol to the command line alternatives (Closes: #799370)

+  * Fixed the detection of the latest Java 8 documentation archives.

 
  -- tony mancill <tmancill@debian.org>  Thu, 18 Jun 2015 22:00:02 -0700
 
 
  -- tony mancill <tmancill@debian.org>  Thu, 18 Jun 2015 22:00:02 -0700
 

diff --git a/lib/oracle-jdk-doc.sh b/lib/oracle-jdk-doc.sh
index 59a00cd35f53572f7ba5a0a5e2295a17228d9c2a..1532a7dcb3eac85d257dc12096b5ca649b5bb51e 100644 (file)
--- a/lib/oracle-jdk-doc.sh
+++ b/lib/oracle-jdk-doc.sh
@@ -3,7 +3,7 @@ oracle_j2sdk_doc_detect() {
   j2se_release=0
 
   # Update or GA release (jdk-7u25-apidocs.zip)
   j2se_release=0
 
   # Update or GA release (jdk-7u25-apidocs.zip)

-  if [[ $archive_name =~ jdk-([0-9]+)(u([0-9]+))?-apidocs\.zip ]]
+  if [[ $archive_name =~ jdk-([0-9]+)(u([0-9]+))?-(apidocs|docs-all)\.zip ]]

   then
     j2se_release=${BASH_REMATCH[1]}
     j2se_update=${BASH_REMATCH[3]}
   then
     j2se_release=${BASH_REMATCH[1]}
     j2se_update=${BASH_REMATCH[3]}