CVS lucene/debian

[Barry Hawkins]

Update of /cvsroot/pkg-java/lucene/debian
In directory haydn:/tmp/cvs-serv13950/debian

Modified Files:
      Tag: RB_1_4_3
	control liblucene-java-doc.doc-base rules 
Log Message:
Initial changes for ant transition.


--- /cvsroot/pkg-java/lucene/debian/control	2005/04/18 23:00:51	1.3.2.11
+++ /cvsroot/pkg-java/lucene/debian/control	2005/09/20 03:04:34	1.3.2.12
@@ -3,12 +3,12 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Barry Hawkins <barry at bytemason.org>, Jeff Breidenbach <jab at debian.org>
-Build-Depends-Indep: debhelper (>= 4.0.0), dpatch (>= 1.11), sun-j2sdk1.4 | blackdown-j2sdk1.4 | java2-compiler, libant1.6-java, javacc, junit
+Build-Depends-Indep: debhelper (>= 4.0.0), dpatch (>= 1.11), sun-j2sdk1.4 | blackdown-j2sdk1.4 | java2-compiler, ant (>= 1.6.5-1), javacc, junit
 Standards-Version: 3.6.1
 
 Package: liblucene-java
 Architecture: all
-Depends: sun-j2sdk1.4 | blackdown-j2sdk1.4 | ibm-j2sdk1.4 | sun-j2re1.4 | blackdown-j2re1.4 | ibm-j2re1.4 | j2sdk1.3 | j2sdk1.4 | j2re1.3 | j2re1.4 | java2-runtime | java1-runtime
+Depends: kaffe (>= 2:1.1.5) | java2-runtime | java1-runtime
 Replaces: liblucene-java-doc (<= 1.4.3-2)
 Suggests: liblucene-java-doc (>= ${Source-Version}), tomcat4
 Description: full-text search engine library for Java(TM) and demonstration programs
@@ -22,5 +22,5 @@
 Architecture: all
 Suggests: liblucene-java (>= ${Source-Version})
 Description: demonstration programs and example code for Lucene
- Documentation and example code for Lucene, which is a  full-text 
+ Documentation and example code for Lucene, which is a full-text 
  search engine for the Java(TM) programming language.
--- /cvsroot/pkg-java/lucene/debian/rules	2005/09/20 02:52:39	1.3.2.10
+++ /cvsroot/pkg-java/lucene/debian/rules	2005/09/20 03:04:34	1.3.2.11
@@ -16,7 +16,7 @@
 TEMPDIR=debian/tmp
 
 # Set JAVA_HOME to be used for Java commands
-JAVA_HOME=/usr/local/kaffe
+JAVA_HOME=/usr/lib/kaffe
 
 # Set the invocation of the java command;
 JAVACMD=$(JAVA_HOME)/bin/java
@@ -25,8 +25,8 @@
 # You need to set CLASSPATH here (even if your build.xml assembles its own
 # class path) to ensure the same build results in all cases
 JAVA_LIB=/usr/share/java
-ANT_HOME=/usr/share/ant1.6
-ANT_CLASSPATH=$(JAVA_LIB)/gnujaxp.jar:$(ANT_HOME)/lib/ant.jar:$(ANT_HOME)/lib/ant-launcher.jar:$(ANT_HOME)/lib/ant-junit.jar:$(JAVA_LIB)/junit.jar:$(JAVA_HOME)/lib/tools.jar:/usr/share/kaffe/Klasses.jar
+ANT_HOME=/usr/share/ant
+ANT_CLASSPATH=$(JAVA_LIB)/gnujaxp.jar:$(ANT_HOME)/lib/ant.jar:$(ANT_HOME)/lib/ant-launcher.jar:$(ANT_HOME)/lib/ant-junit.jar:$(JAVA_LIB)/junit.jar:/usr/share/kaffe/Klasses.jar
 
 # Set path to Ant properties file
 ANT_PROPS=debian/ant.properties