[java-package] 02/05: Fixed the detection of the latest Java 8 documentation archives

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository java-package.

commit 992c0fd53214a94f508bf2e10be25d67c3325c0e
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Sep 18 23:16:22 2015 +0200

    Fixed the detection of the latest Java 8 documentation archives
---
 debian/changelog      | 1 +
 lib/oracle-jdk-doc.sh | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 9a22c8b..3a0f03f 100644
--- 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)
+  * Fixed the detection of the latest Java 8 documentation archives.
 
  -- tony mancill <tmancill at 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 59a00cd..1532a7d 100644
--- 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)
-  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]}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/java-package.git