[maven-debian-helper] 01/02: Improved the detection of the documentation packages

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository maven-debian-helper.

commit e7ff0fed9aae0f408d174bd472ed2e196c4ed860
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Aug 26 10:04:14 2013 +0200

    Improved the detection of the documentation packages
---
 debian/changelog                                      |    1 +
 .../debian/maven/packager/util/PackageScanner.java    |   17 ++++++++++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 9661f3d..5d6f289 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ maven-debian-helper (1.6.6) UNRELEASED; urgency=low
   * Added com.github.github:site-maven-plugin to the ignored plugins
   * Added org.codehaus.mojo:ianal-maven-plugin to the ignored plugins
   * Updated the Maven dependency on maven-repo-helper (1.8.4)
+  * Improved the detection of the documentation packages
 
  -- Emmanuel Bourg <ebourg at apache.org>  Fri, 23 Aug 2013 22:46:59 +0200
 
diff --git a/maven-packager-utils/src/main/java/org/debian/maven/packager/util/PackageScanner.java b/maven-packager-utils/src/main/java/org/debian/maven/packager/util/PackageScanner.java
index 0152299..5446bb7 100644
--- a/maven-packager-utils/src/main/java/org/debian/maven/packager/util/PackageScanner.java
+++ b/maven-packager-utils/src/main/java/org/debian/maven/packager/util/PackageScanner.java
@@ -89,8 +89,23 @@ public class PackageScanner {
         return searchPkg(new File("/usr/share/java/" + dependency.getArtifactId() + ".jar"));
     }
 
+    /**
+     * Searches the package containing the Javadoc for the specified package.
+     * 
+     * @param dependency
+     */
     public DebianDependency searchJavaDocPkg(DebianDependency dependency) {
-        return searchPkg(new File("/usr/share/doc/" + dependency.getPackageName() + "/api/index.html"));
+        DebianDependency pkg = searchPkg(new File("/usr/share/doc/" + dependency.getPackageName() + "/api/index.html"));
+        if (pkg == null) {
+            pkg = searchPkg(new File("/usr/share/doc/" + dependency.getPackageName() + "-doc/api/index.html"));
+        }
+        if (pkg == null) {
+            pkg = searchPkg(new File("/usr/share/doc/" + dependency.getPackageName() + "/apidocs/index.html"));
+        }
+        if (pkg == null) {
+            pkg = searchPkg(new File("/usr/share/doc/" + dependency.getPackageName() + "-doc/apidocs/index.html"));
+        }
+        return pkg;
     }
 
     public DebianDependency searchPkg(File fileToSearch) {

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