This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository ognl.
commit 9d927b3fddc551d880ca332a9dff0b406e0ef14b Author: Emmanuel Bourg <[email protected]> Date: Mon Oct 5 00:26:37 2015 +0200 Link the javadoc with the local JDK documentation --- debian/changelog | 1 + debian/control | 1 + debian/patches/01_build_xml.diff | 17 ----------------- debian/patches/03_javadoc.diff | 20 ++++++++++++++++++++ debian/patches/series | 2 +- 5 files changed, 23 insertions(+), 18 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2091544..00ea9fa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ ognl (2.7.3-6) UNRELEASED; urgency=medium * Team upload * No longer build the PDF documentation to work around a build failure caused by the latest FOP upgrade. + * Link the javadoc with the local JDK documentation * Moved the package to Git * Standards-Version updated to 3.9.6 (no changes) * Switch to debhelper level 9 diff --git a/debian/control b/debian/control index 687bc87..1753194 100644 --- a/debian/control +++ b/debian/control @@ -24,6 +24,7 @@ Package: libognl-java-doc Architecture: all Section: doc Depends: ${misc:Depends} +Suggests: default-jdk-doc Description: Java expression language - Documentation OGNL stands for Object-Graph Navigation Language; it is an expression language for getting and setting properties of Java objects. You use the same diff --git a/debian/patches/01_build_xml.diff b/debian/patches/01_build_xml.diff index 6373a48..5dc6160 100644 --- a/debian/patches/01_build_xml.diff +++ b/debian/patches/01_build_xml.diff @@ -50,23 +50,6 @@ Origin: Damien Raude-Morvan <[email protected]> </target> <target name="docbook-pdf-doc" depends="docbook-init"> ---- a/osbuild.xml -+++ b/osbuild.xml -@@ -138,14 +138,11 @@ - classpathref="cp" - author="true" - version="true" -- overview="${src.java}/overview.html" - windowTitle="${fullname} API - ${version}" - doctitle="${fullname} API (${version})" - footer="<a href="http://www.opensymphony.com/${name}/" target="_top">${fullname} Project Page</a>" - use="true" - verbose="false"> -- <link href="http://java.sun.com/j2se/${compile.version}/docs/api/"/> -- <link href="http://java.sun.com/j2ee/${compile.version}/docs/api/"/> - </javadoc> - <!-- <copy overwrite="yes" file="${docs}/main.css" tofile="${docs}/api/stylesheet.css"/> --> - </target> --- a/build.xml +++ b/build.xml @@ -59,19 +59,19 @@ diff --git a/debian/patches/03_javadoc.diff b/debian/patches/03_javadoc.diff new file mode 100644 index 0000000..a9f6b80 --- /dev/null +++ b/debian/patches/03_javadoc.diff @@ -0,0 +1,20 @@ +Description: Link the javadoc with the local JDK documentation +Origin: Damien Raude-Morvan <[email protected]> +--- a/osbuild.xml ++++ b/osbuild.xml +@@ -138,14 +138,12 @@ + classpathref="cp" + author="true" + version="true" +- overview="${src.java}/overview.html" + windowTitle="${fullname} API - ${version}" + doctitle="${fullname} API (${version})" + footer="<a href="http://www.opensymphony.com/${name}/" target="_top">${fullname} Project Page</a>" + use="true" + verbose="false"> +- <link href="http://java.sun.com/j2se/${compile.version}/docs/api/"/> +- <link href="http://java.sun.com/j2ee/${compile.version}/docs/api/"/> ++ <link href="file:///usr/share/doc/default-jdk/api/"/> + </javadoc> + <!-- <copy overwrite="yes" file="${docs}/main.css" tofile="${docs}/api/stylesheet.css"/> --> + </target> diff --git a/debian/patches/series b/debian/patches/series index 2f8dd63..ffb230c 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,3 @@ 02_docbook_xml_source_compliance.diff 01_build_xml.diff - +03_javadoc.diff -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/ognl.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
