CVS lucene/debian
Barry Hawkins
barryh-guest@haydn.debian.org
Fri Feb 11 14:22:06 2005
Update of /cvsroot/pkg-java/lucene/debian
In directory haydn:/tmp/cvs-serv27217/debian
Modified Files:
Tag: RB_1_4_3
ant.properties changelog control copyright rules
Log Message:
Removed lintian errors, completed introduction of dpatch and ant.properties.
--- /cvsroot/pkg-java/lucene/debian/changelog 2005/01/05 03:47:10 1.3
+++ /cvsroot/pkg-java/lucene/debian/changelog 2005/02/11 21:21:22 1.3.2.1
@@ -1,3 +1,10 @@
+lucene (1.4.3-3) unstable; urgency=low
+
+ * Added use of ant.properties file & defined Ant classpath
+ * Added use of dpatch for patch application/management
+
+ -- Barry Hawkins <barry@alltc.com> Thu, 20 Jan 2005 22:24:14 -0500
+
lucene (1.4.3-2) unstable; urgency=low
* Fix a compilation hiccup
@@ -6,7 +13,7 @@
lucene (1.4.3-1) unstable; urgency=low
- * New upstream Release.
+ * New upstream release
-- Barry Hawkins <barry@alltc.com> Wed, 29 Dec 2004 22:53:59 -0500
--- /cvsroot/pkg-java/lucene/debian/control 2005/01/03 18:14:53 1.3
+++ /cvsroot/pkg-java/lucene/debian/control 2005/02/11 21:21:22 1.3.2.1
@@ -3,19 +3,19 @@
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), javacc, j2sdk1.4 | java2-compiler, ant, junit
+Build-Depends-Indep: debhelper (>= 4.0.0), dpatch (>= 1.11), sun-j2sdk1.4 | java2-compiler, libant1.6-java, javacc, junit
Standards-Version: 3.6.1
Package: liblucene-java
Architecture: all
-Depends: j2re1.4 | java2-runtime | java1-runtime
-Description: Java full-text search engine
+Depends: j2sdk1.4-sun | java2-runtime | java1-runtime
+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
used to add search capabilities to applications.
Package: liblucene-java-doc
Architecture: all
-Description: Lucene demonstration programs and example code
- Document, demonstration and example code for Lucene which
- is a Java full-text search engine.
+Description: demonstration programs and example code for Lucene
+ Documentation, demonstration programs, and example code for Lucene,
+ which is a Java full-text search engine.
--- /cvsroot/pkg-java/lucene/debian/copyright 2005/01/03 04:19:42 1.2
+++ /cvsroot/pkg-java/lucene/debian/copyright 2005/02/11 21:21:22 1.2.2.1
@@ -1,34 +1,15 @@
This package was debianized by Barry Hawkins <barry@alltc.com> on
Wed, 29 Dec 2004 22:53:59 -0500.
-It was downloaded from http://www.apache.org/dyn/closer.cgi/jakarta/lucene/source/
+It was downloaded from http://www.signal42.com/mirrors/apache/jakarta/lucene/source/
-Copyright:
+Authors:
+
+ The Apache Lucene team, see http://jakarta.apache.org/lucene/docs/whoweare.html for details
-Upstream Author(s):
+Copyright:
- Doug Cutting (cutting at apache.org)
- Otis Gospodnetic (otis at apache.org)
- Brian Goetz (briangoetz at apache.org)
- Scott Ganyo (scottganyo at apache.org)
- Eugene Gluzberg (drag0n at apache.org)
- Matt Tucker (mtucker at apache.org)
- Cory Hubert (clhubert at apache.org)
- Dave Kor (davekor at apache.org)
- Jon Stevens (jon at latchkey.com)
- Tal Dayan (zapta at apache.org)
- Andrew C. Oliver (acoliver at apache dot org)
- Peter Carlson (carlson at apache.org)
- Erik Hatcher (ehatcher at apache.org)
- Dmitry Serebrennikov (dmitrys at apache.org)
- Christoph Goller (goller at apache.org)
- Tim Jones (tjones at apache.org)
- Daniel Naber (dnaber at apache.org)
- Bernhard Messer (bmesser at apache.org)
-
- For more information, see http://jakarta.apache.org/lucene/docs/whoweare.html
-
-License:
+The following copyright applies to this package:
/*
*
--- /cvsroot/pkg-java/lucene/debian/rules 2005/01/11 03:26:32 1.3.2.1
+++ /cvsroot/pkg-java/lucene/debian/rules 2005/02/11 21:21:22 1.3.2.2
@@ -3,37 +3,58 @@
# GNU copyright 1997 to 1999 by Joey Hess.
# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+export DH_VERBOSE=1
# This is the debhelper compatibility version to use.
-#export DH_COMPAT=3
+#export DH_COMPAT=4
export LANG=C
+# Include dpatch stuff per the documentation
+include /usr/share/dpatch/dpatch.make
+
VERSION=1.4.3
PNAME=lucene
-# Set JAVA_HOME to be used for build
+CURDIR=$(shell pwd)
+
+# Set JAVA_HOME to be used for Java commands
JAVA_HOME=/usr/lib/j2sdk1.4-sun
-CURDIR=$(shell pwd)
+# Set the invocation of the java command;
+# a stack size augmentation of -Xss 768k
+# is necessary to address an issue with kjc
+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
+# 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
# Set path to Ant properties file
ANT_PROPS=${CURDIR}/debian/ant.properties
+# Universal Ant invocation for reliable builds;
+# place '-verbose' before -propertyfile to
+# obtain detailed build output.
+ANT=${JAVACMD} -classpath ${ANT_CLASSPATH} \
+ org.apache.tools.ant.Main -propertyfile ${ANT_PROPS}
+
build: build-stamp
-build-stamp:
+build-stamp: patch-stamp
dh_testdir
- export JAVA_HOME=$(JAVA_HOME) && ant -propertyfile ${ANT_PROPS} javacc
- export JAVA_HOME=$(JAVA_HOME) && ant -propertyfile ${ANT_PROPS} package
- export JAVA_HOME=$(JAVA_HOME) && ant -propertyfile ${ANT_PROPS} -lib lib test
+ ${ANT} javacc
+ ${ANT} package
+ ${ANT} test
touch build-stamp
-clean:
+clean: unpatch
dh_testdir
dh_testroot
rm -f build-stamp
- export JAVA_HOME=$(JAVA_HOME) && ant -propertyfile ${ANT_PROPS} clean
+ ${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
@@ -93,4 +114,4 @@
dh_builddeb
binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+.PHONY: build clean binary-indep binary-arch binary install patch unpatch