This is an automated email from the git hooks/post-receive script. seamlik-guest pushed a commit to branch master in repository lucene2.
commit 840c212c9f741402f0b8d003d826861d8f9b821f Author: Jan-Pascal van Best <[email protected]> Date: Wed Aug 1 20:32:04 2007 +0000 Fixed javadocs classpath and links to library docs --- debian/TODO.Debian | 4 ++-- debian/changelog | 7 +++++++ debian/control | 4 +++- debian/patches/00list | 2 ++ .../patches/55_disable-db-jre-compilation.dpatch | 17 ++++++++++++---- debian/patches/80_fix-javadocs-classpath.dpatch | 23 ++++++++++++++++++++++ debian/patches/81_fix-javadocs-links.dpatch | 19 ++++++++++++++++++ 7 files changed, 69 insertions(+), 7 deletions(-) diff --git a/debian/TODO.Debian b/debian/TODO.Debian index 937e927..a53ebc8 100644 --- a/debian/TODO.Debian +++ b/debian/TODO.Debian @@ -3,6 +3,6 @@ TODO Stuff to do regarding packaging of lucene-2.x.x: -- In the javadoc, fix the links to external documentation other than Sun's java - API +- Split into -core and -contrib package (maybe even further split up -contrib). +- Try to use gcj instead of Sun java. Maybe just for -core. diff --git a/debian/changelog b/debian/changelog index 5a973fb..854363f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +lucene2 (2.2.0-1~pre6) unstable; urgency=low + + * Fixed warnings in javadoc generation by fixing javadoc classpath + * Added links to locally installed ant and regexp javadocs + + -- Jan-Pascal van Best <[email protected]> Fri, 13 Jul 2007 10:20:12 +0200 + lucene2 (2.2.0-1~pre5) unstable; urgency=low * Updated README.Debian for tomcat5.5 and lucene2 diff --git a/debian/control b/debian/control index 5758763..1f70f7f 100644 --- a/debian/control +++ b/debian/control @@ -45,7 +45,9 @@ Description: Full-text search engine library for Java(TM) Package: liblucene2-java-doc Architecture: all Section: contrib/doc -Depends: ${misc:Depends} +Depends: ${misc:Depends}, + libregexp-java (>= 1.4), + ant-doc Description: Documentation for Lucene Lucene is a full-text search engine for the Java(TM) programming language. Lucene is not a complete application, but rather a code library and API diff --git a/debian/patches/00list b/debian/patches/00list index 58f9e09..633e76c 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -8,3 +8,5 @@ 60_fix-contrib-lucli-libs.dpatch 61_lucli-script.dpatch 70_fix-contrib-regex-libs.dpatch +80_fix-javadocs-classpath.dpatch +81_fix-javadocs-links.dpatch diff --git a/debian/patches/55_disable-db-jre-compilation.dpatch b/debian/patches/55_disable-db-jre-compilation.dpatch index 0807157..66c0ae3 100755 --- a/debian/patches/55_disable-db-jre-compilation.dpatch +++ b/debian/patches/55_disable-db-jre-compilation.dpatch @@ -6,8 +6,8 @@ @DPATCH@ diff -urNad trunk~/build.xml trunk/build.xml ---- trunk~/build.xml 2007-06-19 13:39:47.000000000 +0200 -+++ trunk/build.xml 2007-06-19 13:45:24.000000000 +0200 +--- trunk~/build.xml 2007-07-13 09:37:04.000000000 +0200 ++++ trunk/build.xml 2007-07-13 09:37:59.000000000 +0200 @@ -46,6 +46,7 @@ <fileset dir="contrib"> <include name="**/*.jar"/> @@ -39,9 +39,18 @@ diff -urNad trunk~/build.xml trunk/build.xml /> </subant> </sequential> +@@ -533,7 +534,7 @@ + <packageset dir="contrib/analyzers/src/java"/> + <packageset dir="contrib/ant/src/java"/> + <packageset dir="contrib/benchmark/src/java"/> +- <packageset dir="contrib/db/bdb-je/src/java"/> ++ <!-- debian-ignore <packageset dir="contrib/db/bdb-je/src/java"/> --> + <packageset dir="contrib/db/bdb/src/java"/> + <packageset dir="contrib/highlighter/src/java"/> + <packageset dir="contrib/lucli/src/java"/> diff -urNad trunk~/contrib/db/build.xml trunk/contrib/db/build.xml ---- trunk~/contrib/db/build.xml 2007-06-19 13:39:37.000000000 +0200 -+++ trunk/contrib/db/build.xml 2007-06-19 13:46:48.000000000 +0200 +--- trunk~/contrib/db/build.xml 2007-07-13 09:37:02.000000000 +0200 ++++ trunk/contrib/db/build.xml 2007-07-13 09:37:05.000000000 +0200 @@ -22,41 +22,31 @@ <description> Lucene DB integration diff --git a/debian/patches/80_fix-javadocs-classpath.dpatch b/debian/patches/80_fix-javadocs-classpath.dpatch new file mode 100755 index 0000000..73f4b1e --- /dev/null +++ b/debian/patches/80_fix-javadocs-classpath.dpatch @@ -0,0 +1,23 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 80_fix-javadocs.dpatch by Jan-Pascal van Best <[email protected]> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Add depencies to the Javadoc classpath to avoid warnings during +## DP: generation of the apidocs. + +@DPATCH@ +diff -urNad trunk~/build.xml trunk/build.xml +--- trunk~/build.xml 2007-07-13 09:35:18.000000000 +0200 ++++ trunk/build.xml 2007-07-13 09:35:42.000000000 +0200 +@@ -41,6 +41,11 @@ + <path id="javadoc.classpath"> + <path refid="classpath"/> + <pathelement location="${ant.home}/lib/ant.jar"/> ++ <pathelement location="/usr/share/java/commons-digester.jar"/> ++ <pathelement location="/usr/share/java/jline.jar"/> ++ <pathelement location="/usr/share/java/jtidy.jar"/> ++ <pathelement location="/usr/share/java/libdb4.3-java.jar"/> ++ <pathelement location="/usr/share/java/regexp.jar"/> + + <!-- NOTE: gdata jars only used with jdk 5 but include them even for lower jdk --> + <fileset dir="contrib"> diff --git a/debian/patches/81_fix-javadocs-links.dpatch b/debian/patches/81_fix-javadocs-links.dpatch new file mode 100755 index 0000000..19947ec --- /dev/null +++ b/debian/patches/81_fix-javadocs-links.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 81_fix-javadocs-links.dpatch by Jan-Pascal van Best <[email protected]> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad trunk~/build.xml trunk/build.xml +--- trunk~/build.xml 2007-07-13 10:09:09.000000000 +0200 ++++ trunk/build.xml 2007-07-13 10:09:36.000000000 +0200 +@@ -595,6 +595,8 @@ + + <classpath refid="javadoc.classpath"/> + ++ <link href="file:///usr/share/doc/libregexp-java/api"/> ++ <link href="/usr/share/doc/ant-doc/javadocs"/> + </javadoc> + + </sequential> -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/lucene2.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
