Package: maven-debian-helper
Version: 1.4.2+nmu2
Severity: normal
Tags: patch


When the install-doc goal is invoked the javadoc .jar file get placed in

   debian/null
   
instead of debian/libfoo-java-doc

this results in the javadoc .jar not reaching the binary package and a
problem in debian/rules clean.

The source of the problem (see provided patch) is that in 

InstallDocMojo.java 

  protected String packagePath()
  {
      if (useMavenRepoLocal) {
          return mavenRepoLocal.getAbsolutePath();
      } else {
          return getDebianDir() + "/" + getDestPackage();
      }
  }

the getDestPackage() function returns "null" because the destPackage
attribute is not initialised (it is only initialised inside the
pom_clean target in SystemInstallMojo.java).

I propose to substitute it with the debianPackage property.




-- System Information:
Debian Release: 6.0.1
  APT prefers stable
  APT policy: (500, 'stable')
Architecture: i386 (i686)

Kernel: Linux 2.6.32-5-686 (SMP w/2 CPU cores)
Locale: LANG=es_ES.UTF-8, LC_CTYPE=es_ES.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages maven-debian-helper depends on:
ii  default-jdk                   1:1.6-40   Standard Java or Java compatible D
ii  libmaven-clean-plugin-java    2.3-3      Maven clean plugin
ii  libmaven-compiler-plugin-java 2.0.2-4    Maven compiler plugin
ii  libmaven-jar-plugin-java      2.2-4      Maven Jar plugin
ii  libmaven-resources-plugin-jav 2.3-5      Maven resources plugin
ii  libmaven-site-plugin-java     2.1-1      Maven Site Plugin for generating a
ii  libplexus-velocity-java       1.1.7-3    Plexus component interface to velo
ii  libsurefire-java              2.4.3-3    Surefire test framework for Java
ii  maven-repo-helper             1.5.1+nmu1 Helper tools for including Maven m
ii  maven2                        2.2.1-5    Java software project management a
ii  velocity                      1.6.2-4    Java-based template engine for web

Versions of packages maven-debian-helper recommends:
ii  apt-file                2.4.0            search for files within Debian pac
ii  devscripts              2.10.69+squeeze1 scripts to make the life of a Debi
ii  subversion              1.6.12dfsg-5     Advanced version control system

Versions of packages maven-debian-helper suggests:
ii  libmaven-javadoc-plugin-java  2.6.1-1    Maven Javadoc Plugin

-- no debconf information
diff -ur maven-debian-helper-1.4.2+nmu1/maven-debian-plugin/src/main/java/org/debian/maven/plugin/InstallDocMojo.java maven-debian-helper-1.4.2+nmu2/maven-debian-plugin/src/main/java/org/debian/maven/plugin/InstallDocMojo.java
--- maven-debian-helper-1.4.2+nmu1/maven-debian-plugin/src/main/java/org/debian/maven/plugin/InstallDocMojo.java	2010-12-05 18:23:07.000000000 +0100
+++ maven-debian-helper-1.4.2+nmu2/maven-debian-plugin/src/main/java/org/debian/maven/plugin/InstallDocMojo.java	2011-05-31 13:25:57.000000000 +0200
@@ -53,12 +53,20 @@
   /* returns e.g. $CURDIR/debian/libfoobar-java
    */
 
+    /**
+     * If true, use local Maven repository for installation
+     *
+     * @parameter expression="${debian.package}"
+     */
+    private String debianPackage;
+
+
   protected String packagePath()
   {
       if (useMavenRepoLocal) {
           return mavenRepoLocal.getAbsolutePath();
       } else {
-          return getDebianDir() + "/" + getDestPackage();
+          return getDebianDir() + "/" + debianPackage;
       }
   }
 
__
This is the maintainer address of Debian's Java team
<http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers>. 
Please use
debian-j...@lists.debian.org for discussions and questions.

Reply via email to