r2228 - trunk/lucene/debian

[Michael Koch]

Author: mkoch
Date: 2006-07-01 19:58:15 +0000 (Sat, 01 Jul 2006)
New Revision: 2228

Modified:
   trunk/lucene/debian/changelog
   trunk/lucene/debian/control
   trunk/lucene/debian/rules
Log:
lucene (1.4.3.debian-1) unstable; urgency=low

  * Reupload with new orig.tar.gz (Closes: #338205).
  * (Build-)Depends on java-gcj-compat(-dev).
  * Added myself to Uploaders.

 -- Michael Koch <konqueror at gmx.de>  Sat,  1 Jul 2006 16:42:04 +0000



Modified: trunk/lucene/debian/changelog
===================================================================
--- trunk/lucene/debian/changelog	2006-07-01 16:12:31 UTC (rev 2227)
+++ trunk/lucene/debian/changelog	2006-07-01 19:58:15 UTC (rev 2228)
@@ -1,3 +1,11 @@
+lucene (1.4.3.debian-1) unstable; urgency=low
+
+  * Reupload with new orig.tar.gz (Closes: #338205).
+  * (Build-)Depends on java-gcj-compat(-dev).
+  * Added myself to Uploaders.
+
+ -- Michael Koch <konqueror at gmx.de>  Sat,  1 Jul 2006 16:42:04 +0000
+
 lucene (1.4.3-10) unstable; urgency=low
 
   * Removed explicit use of jikes compiler to reflect change in

Modified: trunk/lucene/debian/control
===================================================================
--- trunk/lucene/debian/control	2006-07-01 16:12:31 UTC (rev 2227)
+++ trunk/lucene/debian/control	2006-07-01 19:58:15 UTC (rev 2228)
@@ -2,15 +2,15 @@
 Section: text
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Barry Hawkins <barry at alltc.com>, Jeff Breidenbach <jab at debian.org>
+Uploaders: Barry Hawkins <barry at alltc.com>, Jeff Breidenbach <jab at debian.org>, Michael Koch <konqueror at gmx.de>
 Build-Depends: debhelper (>= 4.0.0), dpatch (>= 1.11)
-Build-Depends-Indep: kaffe (>= 2:1.1.6), ant (>= 1.6.5-2), ant-optional (>= 1.6.5-2), javacc, junit, libxalan2-java
+Build-Depends-Indep: java-gcj-compat-dev, ant (>= 1.6.5-2), ant-optional (>= 1.6.5-2), javacc, junit, libxalan2-java
 Standards-Version: 3.7.2
 
 Package: liblucene-java
 Architecture: all
 Section: text
-Depends: kaffe (>= 2:1.1.6) | java2-runtime | java1-runtime
+Depends: java-gcj-compat | java2-runtime | java1-runtime
 Replaces: liblucene-java-doc (<= 1.4.3-5)
 Suggests: liblucene-java-doc (>= ${Source-Version}), tomcat4 | tomcat5
 Description: full-text search engine library for Java(TM) and demonstration programs

Modified: trunk/lucene/debian/rules
===================================================================
--- trunk/lucene/debian/rules	2006-07-01 16:12:31 UTC (rev 2227)
+++ trunk/lucene/debian/rules	2006-07-01 19:58:15 UTC (rev 2228)
@@ -16,17 +16,14 @@
 TEMPDIR=debian/tmp
 
 # Set JAVA_HOME to be used for Java commands
-JAVA_HOME=/usr/lib/kaffe
+JAVA_HOME=/usr/lib/jvm/java-gcj
 
-# Set the invocation of the java command;
-JAVACMD=$(JAVA_HOME)/bin/java
-
 # Class path: Ant requires a 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/ant
-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_LIB)/xalan2.jar:/usr/share/kaffe/Klasses.jar
+ANT_CLASSPATH=$(JAVA_LIB)/junit.jar:$(JAVA_LIB)/xalan2.jar
 
 # Set path to Ant properties file
 ANT_PROPS=debian/ant.properties
@@ -34,8 +31,7 @@
 # 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=ant -propertyfile $(ANT_PROPS)
 
 build: build-stamp