CVS lucene/debian

[Barry Hawkins]

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

Modified Files:
      Tag: RB_1_4_3
	ant.properties changelog control rules 
Log Message:
Changes to remediate bug introduced with 1.4.3-3.


--- /cvsroot/pkg-java/lucene/debian/changelog	2005/03/11 05:51:46	1.3.2.3
+++ /cvsroot/pkg-java/lucene/debian/changelog	2005/03/22 03:29:12	1.3.2.4
@@ -1,3 +1,9 @@
+lucene (1.4.3-4) unstable; urgency=low
+
+  * Resolved error with file unpacking (closes: 300653, 300780)
+
+ -- Barry Hawkins <barry@alltc.com>  Mon, 21 Mar 2005 20:36:00 -0500
+
 lucene (1.4.3-3) unstable; urgency=low
 
   * Added explicit declaration of commands and classpath for uniform builds
--- /cvsroot/pkg-java/lucene/debian/control	2005/02/11 21:21:22	1.3.2.1
+++ /cvsroot/pkg-java/lucene/debian/control	2005/03/22 03:29:12	1.3.2.2
@@ -2,13 +2,15 @@
 Section: contrib/text
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
-Uploaders: Barry Hawkins <barry@alltc.com>, Jeff Breidenbach <jab@debian.org>
-Build-Depends-Indep: debhelper (>= 4.0.0), dpatch (>= 1.11), sun-j2sdk1.4 | java2-compiler, libant1.6-java, javacc, junit
+Uploaders: Barry Hawkins <barry@bytemason.org>, Jeff Breidenbach <jab@debian.org>
+Build-Depends-Indep: debhelper (>= 4.0.0), dpatch (>= 1.11), blackdown-j2sdk1.3 | java2-compiler, libant1.6-java, javacc, junit
 Standards-Version: 3.6.1
 
 Package: liblucene-java
 Architecture: all
-Depends: j2sdk1.4-sun | java2-runtime | java1-runtime
+Depends: blackdown-j2sdk1.3 | java2-runtime | java1-runtime
+Conflicts: liblucene-java-doc (>= ${Source-Version})
+Replaces: liblucene-java-doc (>= ${Source-Version})
 Description: full-text search engine library for Java
  Lucene is a Java full-text search engine.  Lucene is not a complete
  application, but rather a code library and API that can easily be 
--- /cvsroot/pkg-java/lucene/debian/rules	2005/03/11 05:51:46	1.3.2.5
+++ /cvsroot/pkg-java/lucene/debian/rules	2005/03/22 03:29:12	1.3.2.6
@@ -1,6 +1,5 @@
 #!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
+# debian/rules for lucene
 
 # Uncomment this to turn on verbose mode.
 export DH_VERBOSE=1
@@ -16,15 +15,13 @@
 PNAME=lucene
 
 CURDIR=$(shell pwd)
+TEMPDIR=$(CURDIR)/debian/tmp
 
 # Set JAVA_HOME to be used for Java commands
 JAVA_HOME=/usr/lib/j2sdk1.4-sun
 
 # Set the invocation of the java command;
-# a stack size augmentation of -Xss 768k 
-# is necessary to address an issue with kjc
-# when it is used as the compiler.
-JAVACMD=${JAVA_HOME}/bin/java 
+JAVACMD=$(JAVA_HOME)/bin/java
 
 # Class path: Ant requires and JAXP-compatible XML parser
 # You need to set CLASSPATH here (even if your build.xml assembles its own
@@ -57,26 +54,26 @@
 	rm -f build-stamp 
 	${ANT} clean
 	dh_clean
-	rm -rf $(CURDIR)/debian/lib$(PNAME)-java/usr/share/java
-	rm -rf $(CURDIR)/debian/lib$(PNAME)-java/var/lib/tomcat4/webapps
+	rm -rf $(TEMPDIR)/lib$(PNAME)-java/usr/share/java
+	rm -rf $(TEMPDIR)/lib$(PNAME)-java/var/lib/tomcat4/webapps
 
 install: build
 	dh_testdir
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
-	mkdir -p $(CURDIR)/debian/lib$(PNAME)-java/usr/share/java
-	mkdir -p $(CURDIR)/debian/lib$(PNAME)-java/var/lib/tomcat4/webapps
+	mkdir -p $(TEMPDIR)/lib$(PNAME)-java/usr/share/java
+	mkdir -p $(TEMPDIR)/lib$(PNAME)-java/var/lib/tomcat4/webapps
 
 	# Add here commands to install the package into debian/lucene.
 	install -m 644	build/${PNAME}-$(VERSION).jar \
 			build/$(PNAME)-demos-$(VERSION).jar \
-			$(CURDIR)/debian/lib$(PNAME)-java/usr/share/java
+			$(TEMPDIR)/lib$(PNAME)-java/usr/share/java
 
 	install -m 644	build/luceneweb.war \
-			$(CURDIR)/debian/lib$(PNAME)-java/var/lib/tomcat4/webapps
+			$(TEMPDIR)/lib$(PNAME)-java/var/lib/tomcat4/webapps
 
-#	dh_movefiles --sourcedir=debian/lib${PNAME}-java
+	dh_movefiles --sourcedir=$(TEMPDIR)/lib${PNAME}-java