[pkg-java] r3967 - in trunk/lucene2/debian: . patches

janpascal-guest at alioth.debian.org janpascal-guest at alioth.debian.org
Wed Aug 1 20:32:04 UTC 2007 

Author: janpascal-guest
Date: 2007-08-01 20:32:04 +0000 (Wed, 01 Aug 2007)
New Revision: 3967

Added:
   trunk/lucene2/debian/patches/80_fix-javadocs-classpath.dpatch
   trunk/lucene2/debian/patches/81_fix-javadocs-links.dpatch
Modified:
   trunk/lucene2/debian/TODO.Debian
   trunk/lucene2/debian/changelog
   trunk/lucene2/debian/control
   trunk/lucene2/debian/patches/00list
   trunk/lucene2/debian/patches/55_disable-db-jre-compilation.dpatch
Log:
Fixed javadocs classpath and links to library docs

Modified: trunk/lucene2/debian/TODO.Debian
===================================================================
--- trunk/lucene2/debian/TODO.Debian	2007-08-01 20:31:59 UTC (rev 3966)
+++ trunk/lucene2/debian/TODO.Debian	2007-08-01 20:32:04 UTC (rev 3967)
@@ -3,6 +3,6 @@
 
 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.
 

Modified: trunk/lucene2/debian/changelog
===================================================================
--- trunk/lucene2/debian/changelog	2007-08-01 20:31:59 UTC (rev 3966)
+++ trunk/lucene2/debian/changelog	2007-08-01 20:32:04 UTC (rev 3967)
@@ -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 <janpascal at vanbest.org>  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

Modified: trunk/lucene2/debian/control
===================================================================
--- trunk/lucene2/debian/control	2007-08-01 20:31:59 UTC (rev 3966)
+++ trunk/lucene2/debian/control	2007-08-01 20:32:04 UTC (rev 3967)
@@ -45,7 +45,9 @@
 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

Modified: trunk/lucene2/debian/patches/00list
===================================================================
--- trunk/lucene2/debian/patches/00list	2007-08-01 20:31:59 UTC (rev 3966)
+++ trunk/lucene2/debian/patches/00list	2007-08-01 20:32:04 UTC (rev 3967)
@@ -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

Modified: trunk/lucene2/debian/patches/55_disable-db-jre-compilation.dpatch
===================================================================
--- trunk/lucene2/debian/patches/55_disable-db-jre-compilation.dpatch	2007-08-01 20:31:59 UTC (rev 3966)
+++ trunk/lucene2/debian/patches/55_disable-db-jre-compilation.dpatch	2007-08-01 20:32:04 UTC (rev 3967)
@@ -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 @@
          />
        </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

Added: trunk/lucene2/debian/patches/80_fix-javadocs-classpath.dpatch
===================================================================
--- trunk/lucene2/debian/patches/80_fix-javadocs-classpath.dpatch	                        (rev 0)
+++ trunk/lucene2/debian/patches/80_fix-javadocs-classpath.dpatch	2007-08-01 20:32:04 UTC (rev 3967)
@@ -0,0 +1,23 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 80_fix-javadocs.dpatch by Jan-Pascal van Best <janpascal at vanbest.org>
+##
+## 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.
+
+ at 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">


Property changes on: trunk/lucene2/debian/patches/80_fix-javadocs-classpath.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Added: trunk/lucene2/debian/patches/81_fix-javadocs-links.dpatch
===================================================================
--- trunk/lucene2/debian/patches/81_fix-javadocs-links.dpatch	                        (rev 0)
+++ trunk/lucene2/debian/patches/81_fix-javadocs-links.dpatch	2007-08-01 20:32:04 UTC (rev 3967)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 81_fix-javadocs-links.dpatch by Jan-Pascal van Best <janpascal at vanbest.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at 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>


Property changes on: trunk/lucene2/debian/patches/81_fix-javadocs-links.dpatch
___________________________________________________________________
Name: svn:executable
   + *

More information about the pkg-java-commits mailing list