CVS lucene/debian
Barry Hawkins
barryh-guest@haydn.debian.org
Wed Mar 23 11:59:10 2005
Update of /cvsroot/pkg-java/lucene/debian
In directory haydn:/tmp/cvs-serv10656/debian
Modified Files:
README.Debian changelog control copyright
liblucene-java-doc.files liblucene-java.files rules
Added Files:
.cvsignore ant.properties compat
Log Message:
Merge of RELEASE_1_4_3-4
--- /cvsroot/pkg-java/lucene/debian/.cvsignore 2005/03/22 20:47:59 1.1
+++ /cvsroot/pkg-java/lucene/debian/.cvsignore 2005/03/23 18:55:55 1.2
@@ -0,0 +1,6 @@
+files
+liblucene-java
+liblucene-java-doc
+patched
+semantic.cache
+tmp
\ No newline at end of file
--- /cvsroot/pkg-java/lucene/debian/ant.properties 2005/01/11 03:26:32 1.1
+++ /cvsroot/pkg-java/lucene/debian/ant.properties 2005/03/23 18:55:55 1.2
@@ -0,0 +1,18 @@
+# Ant properties file for Debian lucene source package
+
+# Version number for upstream source; errors in the
+# upstream source require that it be overridden.
+version=1.4.3
+
+# javacc settings used by Lucene build
+javacc.jar.dir=/usr/share/java
+
+# javac settings used by Lucene compilation
+javac.debug=on
+javac.nowarn=off
+javac.verbose=yes
+# Sun 1.4.2 SDK does not support classic compiler
+build.compiler=modern
+#compile.debug=
+#compile.optimize=
+
--- /cvsroot/pkg-java/lucene/debian/compat 2005/03/11 02:34:22 1.1
+++ /cvsroot/pkg-java/lucene/debian/compat 2005/03/23 18:55:55 1.2
@@ -0,0 +1 @@
+4
--- /cvsroot/pkg-java/lucene/debian/README.Debian 2005/01/03 04:19:41 1.2
+++ /cvsroot/pkg-java/lucene/debian/README.Debian 2005/03/23 18:55:55 1.3
@@ -1,9 +1,15 @@
-lucene for Debian
+Lucene for Debian
-----------------
-The Lucene demos are included in the liblucene-java-doc package. It includes the following files:
+The Javadoc(TM) for Lucene can be found at /usr/share/doc/liblucene-java-doc/docs/index.html.
+
+The Lucene demo applications are included in the liblucene-java package. It includes the following files:
/var/lib/tomcat4/webapps/luceneweb.war
/usr/share/java/lucene-demos-x.x.jar
- -- Barry Hawkins <barry@alltc.com>, Wed, 29 Dec 2004 22:53:59 -0500
+The demonstration applications require additional configuration to be used. To configure the demonstration command-line applications for Lucene, see the documentation at /usr/share/doc/liblucene-java-doc/docs/demo.html. A walkthrough of the source code for the demo is also provided at /usr/share/doc/liblucene-java-doc/docs/demo2.html.
+
+See /usr/share/doc/liblucene-java-doc/docs/demo3.html for information on configuring the Lucene web application to be run in a Java(TM) web container such as Tomcat. A source code walkthrough for this application can be found at /usr/share/doc/liblucene-java-doc/docs/demo4.html
+
+ -- Barry Hawkins <barry@alltc.com>, Tue, 22 Mar 2005 14:20:38 -0500
--- /cvsroot/pkg-java/lucene/debian/changelog 2005/01/05 03:47:10 1.3
+++ /cvsroot/pkg-java/lucene/debian/changelog 2005/03/23 18:55:55 1.4
@@ -1,3 +1,21 @@
+lucene (1.4.3-4) unstable; urgency=low
+
+ * Resolved error with file unpacking by implementing Replaces
+ relationship between liblucene-java and liblucene-java-doc <= 1.4.3-2
+ (closes: 300653, 300780)
+ * Replaced absolute path variables with relative paths in debian/rules
+
+ -- Barry Hawkins <barry@alltc.com> Tue, 22 Mar 2005 11:19:22 -0500
+
+lucene (1.4.3-3) unstable; urgency=low
+
+ * Added explicit declaration of commands and classpath for uniform builds
+ * Added use of external Ant properties file
+ * Added use of dpatch for patch application/management
+ * Added comments to README.Debian regarding use of the demo applications
+
+ -- Barry Hawkins <barry@alltc.com> Fri, 11 Mar 2005 00:46:52 -0500
+
lucene (1.4.3-2) unstable; urgency=low
* Fix a compilation hiccup
@@ -6,7 +24,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/03/23 18:55:55 1.4
@@ -2,20 +2,25 @@
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), javacc, j2sdk1.4 | java2-compiler, ant, junit
+Uploaders: Barry Hawkins <barry@bytemason.org>, Jeff Breidenbach <jab@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
Standards-Version: 3.6.1
Package: liblucene-java
Architecture: all
-Depends: j2re1.4 | java2-runtime | java1-runtime
-Description: Java full-text search engine
- 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.
+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
+Replaces: liblucene-java-doc (<= 1.4.3-2)
+Suggests: liblucene-java-doc (>= ${Source-Version})
+Description: full-text search engine library for Java(TM) and demonstration programs
+ Lucene is a full-text search engine for the Java(TM) programming language.
+ Lucene is not a complete application, but rather a code library and API
+ that can easily be used to add search capabilities to applications.
+ .
+ Sample applications are provided along with the library.
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.
+Suggests: liblucene-java (>= ${Source-Version})
+Description: demonstration programs and example code for Lucene
+ Documentation and example code for Lucene, which is a full-text
+ search engine for the Java(TM) programming language.
--- /cvsroot/pkg-java/lucene/debian/copyright 2005/01/03 04:19:42 1.2
+++ /cvsroot/pkg-java/lucene/debian/copyright 2005/03/23 18:55:55 1.3
@@ -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/liblucene-java-doc.files 2005/01/05 03:47:11 1.2
+++ /cvsroot/pkg-java/lucene/debian/liblucene-java-doc.files 2005/03/23 18:55:55 1.3
@@ -1,2 +1 @@
-usr/share/java/lucene-demos-1.4.3.jar
var/lib/tomcat4/webapps/luceneweb.war
--- /cvsroot/pkg-java/lucene/debian/liblucene-java.files 2005/01/05 03:47:11 1.2
+++ /cvsroot/pkg-java/lucene/debian/liblucene-java.files 2005/03/23 18:55:56 1.3
@@ -1 +1,2 @@
usr/share/java/lucene-1.4.3.jar
+usr/share/java/lucene-demos-1.4.3.jar
--- /cvsroot/pkg-java/lucene/debian/rules 2005/01/05 03:47:11 1.3
+++ /cvsroot/pkg-java/lucene/debian/rules 2005/03/23 18:55:56 1.4
@@ -1,57 +1,77 @@
#!/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
-# This is the debhelper compatibility version to use.
-#export DH_COMPAT=3
+# Set a locale; currently using default
export LANG=C
+# Include dpatch stuff per the documentation
+include /usr/share/dpatch/dpatch.make
+
VERSION=1.4.3
PNAME=lucene
+
+TEMPDIR=debian/tmp
+
+# Set JAVA_HOME to be used for Java commands
JAVA_HOME=/usr/lib/j2sdk1.4-sun
-OVERRIDE=-Djavacc.jar.dir=/usr/share/java -Dversion=$(VERSION)
+# Set the invocation of the java command;
+JAVACMD=$(JAVA_HOME)/bin/java
-CURDIR=$(shell pwd)
+# 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=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 javacc $(OVERRIDE)
- export JAVA_HOME=$(JAVA_HOME) && ant package $(OVERRIDE)
- export JAVA_HOME=$(JAVA_HOME) && ant -lib lib test $(OVERRIDE)
+ $(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 clean $(OVERRIDE)
+ $(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)/usr/share/java
+ rm -rf $(TEMPDIR)/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)/usr/share/java
+ mkdir -p $(TEMPDIR)/var/lib/tomcat4/webapps
# Add here commands to install the package into debian/lucene.
- install -m 644 build/${PNAME}-$(VERSION).jar \
+ install -m 644 build/$(PNAME)-$(VERSION).jar \
build/$(PNAME)-demos-$(VERSION).jar \
- $(CURDIR)/debian/lib$(PNAME)-java/usr/share/java
+ $(TEMPDIR)/usr/share/java
install -m 644 build/luceneweb.war \
- $(CURDIR)/debian/lib$(PNAME)-java/var/lib/tomcat4/webapps
+ $(TEMPDIR)/var/lib/tomcat4/webapps
- dh_movefiles --sourcedir=debian/lib${PNAME}-java
+ dh_movefiles
@@ -90,4 +110,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