[pkg-java] r11947 - in trunk/libfreemarker-java/debian: . patches

[Niels Thykier]

Author: nthykier-guest
Date: 2010-03-27 13:01:22 +0000 (Sat, 27 Mar 2010)
New Revision: 11947

Modified:
   trunk/libfreemarker-java/debian/changelog
   trunk/libfreemarker-java/debian/control
   trunk/libfreemarker-java/debian/patches/def-jdk-doc.patch
Log:
Link javadoc against system docs.

Modified: trunk/libfreemarker-java/debian/changelog
===================================================================
--- trunk/libfreemarker-java/debian/changelog	2010-03-27 02:14:00 UTC (rev 11946)
+++ trunk/libfreemarker-java/debian/changelog	2010-03-27 13:01:22 UTC (rev 11947)
@@ -9,7 +9,9 @@
   * Corrected Java runtime depends.
   * Added used java libraries to Depends and Suggests based on whether
     the build used them unconditionally.
-  * Made the javadoc API link against default-jdk-doc's API.
+  * Made the javadoc API link against the javadoc APIs installed on
+    the system.
+    - Added patch def-jdk-doc.patch.
 
  -- Niels Thykier <niels at thykier.net>  Sat, 27 Mar 2010 00:00:38 +0100
 

Modified: trunk/libfreemarker-java/debian/control
===================================================================
--- trunk/libfreemarker-java/debian/control	2010-03-27 02:14:00 UTC (rev 11946)
+++ trunk/libfreemarker-java/debian/control	2010-03-27 13:01:22 UTC (rev 11947)
@@ -8,7 +8,10 @@
 Build-Depends-Indep: ant-optional, libservlet2.5-java,
  javacc, junit, jython, libdom4j-java, libjaxen-java, libjdom1-java,
  liblog4j1.2-java, libexcalibur-logkit-java, libxerces2-java, rhino,
- libcommons-jxpath-java, libxalan2-java, maven-repo-helper, default-jdk-doc
+ libcommons-jxpath-java, libxalan2-java, maven-repo-helper, default-jdk-doc,
+ libdom4j-java-doc, rhino-doc, jython-doc, liblog4j1.2-java-doc,
+ libjaxen-java-doc, libjdom1-java-doc, libxerces2-java-doc,
+ libcommons-jxpath-java-doc, libxalan2-java-doc
 Standards-Version: 3.8.4
 Homepage: http://www.freemarker.org/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libfreemarker-java
@@ -21,7 +24,7 @@
          libservlet2.5-java,
          ${misc:Depends}
 Suggests: jython, rhino, libjdom1-java, libdom4j-java, libjaxen-java,
-          libxalan2-java
+          libxalan2-java, libexcalibur-logkit-java
 Description: a template engine written in Java
  FreeMarker is a "template engine"; a generic tool to generate text output
  (anything from HTML to autogenerated source code) based on templates. It's a
@@ -44,7 +47,17 @@
 Package: libfreemarker-java-doc
 Section: doc
 Architecture: all
-Depends: default-jdk-doc, ${misc:Depends}
+Depends: default-jdk-doc,
+         jython-doc,
+         libcommons-jxpath-java,
+         libjdom1-java-doc,
+         libdom4j-java-doc,
+         libjaxen-java-doc,
+         liblog4j1.2-java-doc,
+         libxalan2-java-doc,
+         libxerces2-java-doc,
+         rhino-doc,
+         ${misc:Depends}
 Suggests: libfreemarker-java
 Description: a template engine written in Java (documentation)
  FreeMarker is a "template engine"; a generic tool to generate text output

Modified: trunk/libfreemarker-java/debian/patches/def-jdk-doc.patch
===================================================================
--- trunk/libfreemarker-java/debian/patches/def-jdk-doc.patch	2010-03-27 02:14:00 UTC (rev 11946)
+++ trunk/libfreemarker-java/debian/patches/def-jdk-doc.patch	2010-03-27 13:01:22 UTC (rev 11947)
@@ -1,12 +1,23 @@
 Description: Link the javadoc against the system javadoc.
+Author: Niels Thykier <niels at thykier.net>
 
 --- a/build.xml	2010-03-27 00:15:23.231497299 +0100
 +++ b/build.xml	2010-03-27 00:15:01.651506989 +0100
-@@ -407,6 +407,7 @@
+@@ -407,6 +407,17 @@
                  windowtitle="FreeMarker ${version} API"
                  classpathref="compile.classpath.javadoc"
                  use="${javadoc.use}">
 +	  <link href="/usr/share/doc/default-jdk-doc/api/" />
++	  <link href="/usr/share/doc/libdom4j-java-doc/apidocs/" />
++	  <link href="/usr/share/doc/rhino/api/" />
++	  <link href="/usr/share/doc/jython-doc/api-html/" />
++	  <link href="/usr/share/doc/liblog4j1.2-java/api/" />
++	  <link href="/usr/share/doc/libjaxen-java/api/" />
++	  <link href="/usr/share/doc/libjdom1-java/api/" />
++	  <link href="/usr/share/doc/libxerces2-java-doc/api/" />
++	  <link href="/usr/share/doc/libcommons-jxpath-java-doc/api/" />
++	  <link href="/usr/share/doc/libcommons-jxpath-java-doc/api/" />
++	  <link href="/usr/share/doc/libxalan2-java/api/" />
          </javadoc>
      </target>