CVS lucene/debian

[Jeff Breidenbach]

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

Modified Files:
	changelog liblucene-java-doc.files liblucene-java.files 
	liblucene-java.links rules 
Log Message:
fix compile problem

--- /cvsroot/pkg-java/lucene/debian/changelog	2005/01/03 04:19:42	1.2
+++ /cvsroot/pkg-java/lucene/debian/changelog	2005/01/05 03:47:10	1.3
@@ -1,3 +1,9 @@
+lucene (1.4.3-2) unstable; urgency=low
+
+  * Fix a compilation hiccup
+
+ -- Jeff Breidenbach <jab@debian.org>  Tue,  4 Jan 2005 19:30:46 -0800
+
 lucene (1.4.3-1) unstable; urgency=low
 
   * New upstream Release.
--- /cvsroot/pkg-java/lucene/debian/liblucene-java-doc.files	2004/12/14 23:34:22	1.1.1.1
+++ /cvsroot/pkg-java/lucene/debian/liblucene-java-doc.files	2005/01/05 03:47:11	1.2
@@ -1,2 +1,2 @@
-usr/share/java/lucene-demos-1.4.jar
+usr/share/java/lucene-demos-1.4.3.jar
 var/lib/tomcat4/webapps/luceneweb.war
--- /cvsroot/pkg-java/lucene/debian/liblucene-java.files	2004/12/14 23:34:22	1.1.1.1
+++ /cvsroot/pkg-java/lucene/debian/liblucene-java.files	2005/01/05 03:47:11	1.2
@@ -1 +1 @@
-usr/share/java/lucene-1.4.jar
+usr/share/java/lucene-1.4.3.jar
--- /cvsroot/pkg-java/lucene/debian/liblucene-java.links	2004/12/14 23:34:22	1.1.1.1
+++ /cvsroot/pkg-java/lucene/debian/liblucene-java.links	2005/01/05 03:47:11	1.2
@@ -1 +1 @@
-usr/share/java/lucene-1.4.jar usr/share/java/lucene.jar
+usr/share/java/lucene-1.4.3.jar usr/share/java/lucene.jar
--- /cvsroot/pkg-java/lucene/debian/rules	2005/01/03 18:13:52	1.2
+++ /cvsroot/pkg-java/lucene/debian/rules	2005/01/05 03:47:11	1.3
@@ -9,8 +9,11 @@
 #export DH_COMPAT=3
 export LANG=C
 
-VERSION=1.4
+VERSION=1.4.3
 PNAME=lucene
+JAVA_HOME=/usr/lib/j2sdk1.4-sun
+
+OVERRIDE=-Djavacc.jar.dir=/usr/share/java -Dversion=$(VERSION)
 
 CURDIR=$(shell pwd)
 
@@ -18,16 +21,16 @@
 
 build-stamp:
 	dh_testdir
-	ant javacc
-	ant package
-	ant -lib lib test
+	export JAVA_HOME=$(JAVA_HOME) && ant  javacc $(OVERRIDE)
+	export JAVA_HOME=$(JAVA_HOME) && ant package $(OVERRIDE)
+	export JAVA_HOME=$(JAVA_HOME) && ant -lib lib test $(OVERRIDE)
 	touch build-stamp
 
 clean:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp 
-	ant clean
+	export JAVA_HOME=$(JAVA_HOME) && ant clean $(OVERRIDE)
 	dh_clean
 	rm -rf $(CURDIR)/debian/lib$(PNAME)-java/usr/share/java
 	rm -rf $(CURDIR)/debian/lib$(PNAME)-java/var/lib/tomcat4/webapps