[pkg-java] r3969 - trunk/lucene2/debian

[janpascal-guest at alioth.debian.org]

Author: janpascal-guest
Date: 2007-08-01 20:32:18 +0000 (Wed, 01 Aug 2007)
New Revision: 3969

Modified:
   trunk/lucene2/debian/ant.properties
   trunk/lucene2/debian/changelog
   trunk/lucene2/debian/control
   trunk/lucene2/debian/rules
Log:
Moving to gcj

Modified: trunk/lucene2/debian/ant.properties
===================================================================
--- trunk/lucene2/debian/ant.properties	2007-08-01 20:32:10 UTC (rev 3968)
+++ trunk/lucene2/debian/ant.properties	2007-08-01 20:32:18 UTC (rev 3969)
@@ -14,6 +14,6 @@
 javac.nowarn=off
 javac.verbose=yes
 # build.rmic=kaffe
-build.compiler=javac1.5
+# build.compiler=javac1.5
 compile.debug=on
 compile.optimize=on

Modified: trunk/lucene2/debian/changelog
===================================================================
--- trunk/lucene2/debian/changelog	2007-08-01 20:32:10 UTC (rev 3968)
+++ trunk/lucene2/debian/changelog	2007-08-01 20:32:18 UTC (rev 3969)
@@ -1,3 +1,9 @@
+lucene2 (2.2.0-2~pre1) unstable; urgency=low
+
+  * Moved to gcj (from sun-java5)
+
+ -- Jan-Pascal van Best <janpascal at vanbest.org>  Wed, 18 Jul 2007 08:25:20 +0200
+
 lucene2 (2.2.0-1) unstable; urgency=low
 
   * New upstream release (2.2.0)

Modified: trunk/lucene2/debian/control
===================================================================
--- trunk/lucene2/debian/control	2007-08-01 20:32:10 UTC (rev 3968)
+++ trunk/lucene2/debian/control	2007-08-01 20:32:18 UTC (rev 3969)
@@ -6,7 +6,8 @@
  Jeff Breidenbach <jab at debian.org>, Michael Koch <konqueror at gmx.de>
 XS-Vcs-Browser: http://www.vanbest.org/websvn/lucene2
 XS-Vcs-svn: http://svn.vanbest.org/svn/lucene2
-Build-Depends: debhelper (>= 4.0.0), dpatch (>= 2.0), sun-java5-jre, sun-java5-jdk, 
+Build-Depends: debhelper (>= 4.0.0), dpatch (>= 2.0), 
+ java-gcj-compat-dev,
  ant-optional, javacc, junit, libxalan2-java
 Build-Depends-Indep: libjtidy-java (>= 7),
  libjline-java (>= 0.9.5), 

Modified: trunk/lucene2/debian/rules
===================================================================
--- trunk/lucene2/debian/rules	2007-08-01 20:32:10 UTC (rev 3968)
+++ trunk/lucene2/debian/rules	2007-08-01 20:32:18 UTC (rev 3969)
@@ -22,8 +22,8 @@
 LUCENE_VERSION := $(shell echo $(DEBIAN_VERSION) | grep -o "^[[:digit:]\.]*")
 UPSTREAM_BASENAME = lucene-$(LUCENE_VERSION)
 
-# Explicitly build with sun-java5-jdk
-export JAVA_HOME = /usr/lib/jvm/java-1.5.0-sun
+# Explicitly build with gcj
+export JAVA_HOME = /usr/lib/jvm/java-gcj
 export JAVA = $(JAVA_HOME)/bin/java
 export JAVAC = $(JAVA_HOME)/bin/javac
 
@@ -73,7 +73,7 @@
 	$(ANT) build-contrib
 	$(ANT) war-demo
 	# Skipping (very time consuming) until production time...
-	# $(ANT) test
+	$(ANT) test
 	$(ANT) javadocs
 
 	touch build-indep-stamp