CVS lucene/debian
Barry Hawkins
barryh-guest@haydn.debian.org
Tue Mar 22 01:38:02 2005
Update of /cvsroot/pkg-java/lucene/debian
In directory haydn:/tmp/cvs-serv6703/debian
Modified Files:
Tag: RB_1_4_3
ant.properties changelog control rules
Log Message:
Latest changes involved in resolving package conflict bug for 1.4.3-3.
--- /cvsroot/pkg-java/lucene/debian/changelog 2005/03/22 03:29:12 1.3.2.4
+++ /cvsroot/pkg-java/lucene/debian/changelog 2005/03/22 08:37:28 1.3.2.5
@@ -1,6 +1,8 @@
lucene (1.4.3-4) unstable; urgency=low
- * Resolved error with file unpacking (closes: 300653, 300780)
+ * Resolved error with file unpacking by implementing Conflicts and
+ Replaces relationships (closes: 300653, 300780)
+ * Replaced absolute path variables with relative paths in build script
-- Barry Hawkins <barry@alltc.com> Mon, 21 Mar 2005 20:36:00 -0500
--- /cvsroot/pkg-java/lucene/debian/control 2005/03/22 03:29:12 1.3.2.2
+++ /cvsroot/pkg-java/lucene/debian/control 2005/03/22 08:37:28 1.3.2.3
@@ -3,14 +3,13 @@
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
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
+Build-Depends-Indep: debhelper (>= 4.0.0), dpatch (>= 1.11), j2sdk1.4-sun | java2-compiler, libant1.6-java, javacc, junit
Standards-Version: 3.6.1
Package: liblucene-java
Architecture: all
-Depends: blackdown-j2sdk1.3 | java2-runtime | java1-runtime
-Conflicts: liblucene-java-doc (>= ${Source-Version})
-Replaces: liblucene-java-doc (>= ${Source-Version})
+Depends: java2-runtime | java1-runtime
+Suggests: 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
@@ -18,6 +17,7 @@
Package: liblucene-java-doc
Architecture: all
+Suggests: liblucene-java (>= ${Source-Version})
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/rules 2005/03/22 03:29:12 1.3.2.6
+++ /cvsroot/pkg-java/lucene/debian/rules 2005/03/22 08:37:28 1.3.2.7
@@ -14,8 +14,7 @@
VERSION=1.4.3
PNAME=lucene
-CURDIR=$(shell pwd)
-TEMPDIR=$(CURDIR)/debian/tmp
+TEMPDIR=debian/tmp
# Set JAVA_HOME to be used for Java commands
JAVA_HOME=/usr/lib/j2sdk1.4-sun
@@ -28,52 +27,52 @@
# 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
+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
+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}
+ANT=$(JAVACMD) -classpath $(ANT_CLASSPATH) \
+ org.apache.tools.ant.Main -propertyfile $(ANT_PROPS)
build: build-stamp
build-stamp: patch-stamp
dh_testdir
- ${ANT} javacc
- ${ANT} package
- ${ANT} test
+ $(ANT) javacc
+ $(ANT) package
+ $(ANT) test
touch build-stamp
clean: unpatch
dh_testdir
dh_testroot
rm -f build-stamp
- ${ANT} clean
+ $(ANT) clean
dh_clean
- rm -rf $(TEMPDIR)/lib$(PNAME)-java/usr/share/java
- rm -rf $(TEMPDIR)/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 $(TEMPDIR)/lib$(PNAME)-java/usr/share/java
- mkdir -p $(TEMPDIR)/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 \
- $(TEMPDIR)/lib$(PNAME)-java/usr/share/java
+ $(TEMPDIR)/usr/share/java
install -m 644 build/luceneweb.war \
- $(TEMPDIR)/lib$(PNAME)-java/var/lib/tomcat4/webapps
+ $(TEMPDIR)/var/lib/tomcat4/webapps
- dh_movefiles --sourcedir=$(TEMPDIR)/lib${PNAME}-java
+ dh_movefiles