[pkg-java] r9428 - in trunk/maven-ant-helper: . debian

[Ludovic Claude]

Author: ludovicc-guest
Date: 2009-08-01 18:57:59 +0000 (Sat, 01 Aug 2009)
New Revision: 9428

Modified:
   trunk/maven-ant-helper/debian/changelog
   trunk/maven-ant-helper/debian/control
   trunk/maven-ant-helper/maven-build.xml
Log:
* Add ant and ant-optional to Depends:
* Add more Suggest: packages (libmaven-plugin-plugin-java and
  libplexus-components-metadata-java as they provide useful
  Maven plugin often used in the build)
* Add support for linking generated Javadoc to other 
  documented libraries.

Modified: trunk/maven-ant-helper/debian/changelog
===================================================================
--- trunk/maven-ant-helper/debian/changelog	2009-07-31 19:20:55 UTC (rev 9427)
+++ trunk/maven-ant-helper/debian/changelog	2009-08-01 18:57:59 UTC (rev 9428)
@@ -1,3 +1,14 @@
+maven-ant-helper (6.3) experimental; urgency=low
+
+  * Add ant and ant-optional to Depends:
+  * Add more Suggest: packages (libmaven-plugin-plugin-java and
+    libplexus-components-metadata-java as they provide useful
+    Maven plugin often used in the build)
+  * Add support for linking generated Javadoc to other 
+    documented libraries.
+
+ -- Ludovic Claude <ludovic.claude at laposte.net>  Thu, 16 Jul 2009 22:34:35 +0100
+
 maven-ant-helper (6.2) experimental; urgency=low
 
   * Fix a bug introduced by previous version. It was affecting

Modified: trunk/maven-ant-helper/debian/control
===================================================================
--- trunk/maven-ant-helper/debian/control	2009-07-31 19:20:55 UTC (rev 9427)
+++ trunk/maven-ant-helper/debian/control	2009-08-01 18:57:59 UTC (rev 9428)
@@ -14,8 +14,10 @@
 Package: maven-ant-helper
 Architecture: all
 Section: java
-Depends: ${misc:Depends}
-Recommends: libmodello-java (>= 1.0), libmaven2-core-java, maven-repo-helper
+Depends: ${misc:Depends}, ant, ant-optional
+Recommends: libmodello-java (>= 1.0), libmaven2-core-java, 
+ libmaven-plugin-tools-java, libplexus-component-metadata-java, 
+ maven-repo-helper 
 Description: helper scripts for building Maven components with ant
  An environment that can be used to simplify the creation of Debian packages
  to support the Maven system. A "modello" ant task is also provided.

Modified: trunk/maven-ant-helper/maven-build.xml
===================================================================
--- trunk/maven-ant-helper/maven-build.xml	2009-07-31 19:20:55 UTC (rev 9427)
+++ trunk/maven-ant-helper/maven-build.xml	2009-08-01 18:57:59 UTC (rev 9428)
@@ -32,6 +32,12 @@
           maven-build.xml with the restore-pom target (without the keep-cleaned-pom property set).
        use-local-repo: if set, then Maven will use a local repository copied from /usr/share/maven-repo into
           debian/tmp. This allows you to install some custom or intermediate artifacts, handy for multi modules builds.
+       dependency, dependency2, dependency3...: Give the name of the dependent packages. Those packages will be
+          used to form the links to the Javadoc APIs from the generated Javadoc. 
+          The links are of the form: file:///usr/share/doc/${dependency}/api
+          Up to 15 dependencies can be defined here. Example use:
+            dependency=libcommons-lang-java
+            dependency2=libcommons-logging-java
 
        If you provide a pom file to your project, or the project already contains a pom file,
        then it will be read. You need to add /usr/share/java/ant-nodeps.jar to the classpath
@@ -385,7 +391,23 @@
             <packageset dir="${build.sourceDirectory}" defaultexcludes="yes">
                 <include name="**"/>
             </packageset>
-
+            <link href="file:///usr/share/doc/openjdk-6-doc/api" />
+            <link href="file:///usr/share/doc/classpath-doc/api" />
+            <link href="file:///usr/share/doc/${dependency}/api" />
+            <link href="file:///usr/share/doc/${dependency2}/api" />
+            <link href="file:///usr/share/doc/${dependency3}/api" />
+            <link href="file:///usr/share/doc/${dependency4}/api" />
+            <link href="file:///usr/share/doc/${dependency5}/api" />
+            <link href="file:///usr/share/doc/${dependency6}/api" />
+            <link href="file:///usr/share/doc/${dependency7}/api" />
+            <link href="file:///usr/share/doc/${dependency8}/api" />
+            <link href="file:///usr/share/doc/${dependency9}/api" />
+            <link href="file:///usr/share/doc/${dependency10}/api" />
+            <link href="file:///usr/share/doc/${dependency11}/api" />
+            <link href="file:///usr/share/doc/${dependency12}/api" />
+            <link href="file:///usr/share/doc/${dependency13}/api" />
+            <link href="file:///usr/share/doc/${dependency14}/api" />
+            <link href="file:///usr/share/doc/${dependency15}/api" />
         </javadoc>
     </target>
 </project>