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

[Niels Thykier]

Author: nthykier-guest
Date: 2010-03-26 23:29:29 +0000 (Fri, 26 Mar 2010)
New Revision: 11945

Added:
   trunk/libfreemarker-java/debian/patches/def-jdk-doc.patch
Modified:
   trunk/libfreemarker-java/debian/changelog
   trunk/libfreemarker-java/debian/control
   trunk/libfreemarker-java/debian/patches/series
Log:
Made the javadoc API link against default-jdk-doc's API.

Modified: trunk/libfreemarker-java/debian/changelog
===================================================================
--- trunk/libfreemarker-java/debian/changelog	2010-03-26 23:01:13 UTC (rev 11944)
+++ trunk/libfreemarker-java/debian/changelog	2010-03-26 23:29:29 UTC (rev 11945)
@@ -9,6 +9,7 @@
   * 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.
 
  -- 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-26 23:01:13 UTC (rev 11944)
+++ trunk/libfreemarker-java/debian/control	2010-03-26 23:29:29 UTC (rev 11945)
@@ -8,7 +8,7 @@
 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
+ libcommons-jxpath-java, libxalan2-java, maven-repo-helper, default-jdk-doc
 Standards-Version: 3.8.4
 Homepage: http://www.freemarker.org/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libfreemarker-java
@@ -44,7 +44,7 @@
 Package: libfreemarker-java-doc
 Section: doc
 Architecture: all
-Depends: ${misc:Depends}
+Depends: default-jdk-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

Added: trunk/libfreemarker-java/debian/patches/def-jdk-doc.patch
===================================================================
--- trunk/libfreemarker-java/debian/patches/def-jdk-doc.patch	                        (rev 0)
+++ trunk/libfreemarker-java/debian/patches/def-jdk-doc.patch	2010-03-26 23:29:29 UTC (rev 11945)
@@ -0,0 +1,12 @@
+Description: Link the javadoc against the system javadoc.
+
+--- 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 @@
+                 windowtitle="FreeMarker ${version} API"
+                 classpathref="compile.classpath.javadoc"
+                 use="${javadoc.use}">
++	  <link href="/usr/share/doc/default-jdk-doc/api/" />
+         </javadoc>
+     </target>
+ 

Modified: trunk/libfreemarker-java/debian/patches/series
===================================================================
--- trunk/libfreemarker-java/debian/patches/series	2010-03-26 23:01:13 UTC (rev 11944)
+++ trunk/libfreemarker-java/debian/patches/series	2010-03-26 23:29:29 UTC (rev 11945)
@@ -3,3 +3,4 @@
 jdom1.diff
 javacc.diff
 jsp_api.diff
+def-jdk-doc.patch