[pkg-java] r3940 - trunk/lucene2/debian/patches

[janpascal-guest at alioth.debian.org]

Author: janpascal-guest
Date: 2007-08-01 20:29:33 +0000 (Wed, 01 Aug 2007)
New Revision: 3940

Added:
   trunk/lucene2/debian/patches/01_full
Modified:
   trunk/lucene2/debian/patches/00list
Log:
Fixes patches again

Modified: trunk/lucene2/debian/patches/00list
===================================================================
--- trunk/lucene2/debian/patches/00list	2007-08-01 20:29:28 UTC (rev 3939)
+++ trunk/lucene2/debian/patches/00list	2007-08-01 20:29:33 UTC (rev 3940)
@@ -1 +1 @@
-01full
+01_full

Added: trunk/lucene2/debian/patches/01_full
===================================================================
--- trunk/lucene2/debian/patches/01_full	                        (rev 0)
+++ trunk/lucene2/debian/patches/01_full	2007-08-01 20:29:33 UTC (rev 3940)
@@ -0,0 +1,124 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_full.dpatch by  <janpascal at vanbest.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+
+--- lucene2-2.1.0.orig/contrib/db/bdb/build.xml
++++ lucene2-2.1.0/contrib/db/bdb/build.xml
+@@ -8,7 +8,7 @@
+   <property name="db.version" value="4.3.29" />
+ 
+   <path id="db.jar">
+-    <pathelement location="lib/db-${db.version}.jar" />
++    <pathelement location="/usr/share/java/libdb4.3-java.jar" />
+   </path>
+ 
+   <available classname="com.sleepycat.db.internal.Db" property="db.jar.exists">
+@@ -19,6 +19,7 @@
+ 
+   <property name="build.dir" location="../../../build/contrib/db/bdb" />
+   <property name="dist.dir" location="../../../dist/contrib/db/bdb" />
++  <property name="java.library.path" location="/usr/lib/libdb_java.so" />
+ 
+   <import file="../../contrib-build.xml" />
+ 
+--- lucene2-2.1.0.orig/contrib/lucli/build.xml
++++ lucene2-2.1.0/contrib/lucli/build.xml
+@@ -8,7 +8,7 @@
+ 
+ 
+   <path id="additional.dependencies">
+-    <pathelement location="lib/jline.jar"/>
++    <pathelement location="/usr/share/java/jline.jar"/>
+   </path>
+ 
+   <pathconvert property="project.classpath"
+--- lucene2-2.1.0.orig/contrib/regex/build.xml
++++ lucene2-2.1.0/contrib/regex/build.xml
+@@ -7,7 +7,8 @@
+   </description>
+ 
+   <path id="additional.dependencies">
+-    <fileset dir="lib" includes="*-oro-*.jar,*-regexp-*.jar"/>
++    <fileset dir="/usr/share/java" includes="regexp-*.jar"/>
++    <!--<fileset dir="/usr/share/java" includes="*-oro-*.jar,*-regexp-*.jar"/> -->
+   </path>
+ 
+   <pathconvert property="project.classpath"
+--- lucene2-2.1.0.orig/contrib/contrib-build.xml
++++ lucene2-2.1.0/contrib/contrib-build.xml
+@@ -19,6 +19,7 @@
+   <path id="test.classpath">
+     <path refid="classpath"/>
+     <pathelement location="${junit.jar}"/>
++    <pathelement location="../../build/classes/test"/>
+     <pathelement location="${build.dir}/classes/java"/>
+   </path>
+ 
+--- lucene2-2.1.0.orig/build.xml
++++ lucene2-2.1.0/build.xml
+@@ -386,7 +386,7 @@
+ 	<packageset dir="src/demo"/>
+ 	
+         <packageset dir="contrib/analyzers/src/java"/>
+-        <packageset dir="contrib/ant/src/java"/>
++        <!-- debian-ignore <packageset dir="contrib/ant/src/java"/> -->
+         <packageset dir="contrib/highlighter/src/java"/>
+         <packageset dir="contrib/lucli/src/java"/>
+         <packageset dir="contrib/memory/src/java"/>
+@@ -400,9 +400,9 @@
+         <packageset dir="contrib/wordnet/src/java"/>
+           <packageset dir="contrib/benchmark/src/java"/>
+         
+-        <packageset refid="gdata-server-core" />
+-        <packageset refid="gdata-server-gom" />
+-        <packageset refid="gdata-server-hivemind" />
++        <!-- debian-ignore <packageset refid="gdata-server-core" /> -->
++        <!-- debian-ignore <packageset refid="gdata-server-gom" /> -->
++        <!-- debian-ignore <packageset refid="gdata-server-hivemind" /> -->
+ 
+         <group title="Core" packages="org.apache.*:org.apache.lucene.analysis:org.apache.lucene.analysis.standard*"/>
+ 
+@@ -425,6 +425,9 @@
+         <group title="contrib: Swing" packages="org.apache.lucene.swing*"/>
+         <group title="contrib: WordNet" packages="org.apache.lucene.wordnet*"/>
+ 
++	<link href="http://jline.sourceforge.net/apidocs/"/>
++	<link href="http://jakarta.apache.org/regexp/apidocs/"/>
++	<link href="http://jakarta.apache.org/commons/digester/commons-digester-1.7/docs/api/"/>
+ 	
+       </javadoc>
+     </sequential>
+--- lucene2-2.1.0.orig/common-build.xml
++++ lucene2-2.1.0/common-build.xml
+@@ -22,7 +22,7 @@
+ 
+   <property name="name" value="${ant.project.name}"/>
+   <property name="Name" value="Lucene"/>
+-  <property name="version" value="2.1.1-dev"/>
++  <property name="version" value="2.1.0"/>
+   <property name="year" value="2000-${current.year}"/>
+   <property name="final.name" value="lucene-${name}-${version}"/>
+ 
+@@ -38,7 +38,8 @@
+   <property name="build.dir" location="build"/>
+   <property name="dist.dir" location="dist"/>
+ 
+-  <property name="javacc.home" location="${common.dir}"/>
++  <property name="javacc.home" location="/usr/share/java"/>
++  <property name="javacc.jar" location="/usr/share/java/javacc.jar"/>
+ 
+   <property name="junit.output.dir" location="${build.dir}/test"/>
+   <property name="junit.reports" location="${build.dir}/test/reports"/>
+@@ -64,7 +65,7 @@
+   <available
+     property="javacc.present"
+     classname="org.javacc.parser.Main"
+-    classpath="${javacc.home}/bin/lib/javacc.jar"
++    classpath="/usr/share/java/javacc.jar"
+     />
+ 
+   <available


Property changes on: trunk/lucene2/debian/patches/01_full
___________________________________________________________________
Name: svn:executable
   + *