[lucene2] 33/104: Moving to gcj

[Kai-Chung Yan]

This is an automated email from the git hooks/post-receive script.

seamlik-guest pushed a commit to branch master
in repository lucene2.

commit 997abbae65fb5d653249329b3f3fc2ae44021657
Author: Jan-Pascal van Best <janpascal at vanbest.org>
Date:   Wed Aug 1 20:32:18 2007 +0000

    Moving to gcj
---
 debian/ant.properties | 2 +-
 debian/changelog      | 6 ++++++
 debian/control        | 3 ++-
 debian/rules          | 6 +++---
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/debian/ant.properties b/debian/ant.properties
index a07b79f..2c86fa5 100644
--- a/debian/ant.properties
+++ b/debian/ant.properties
@@ -14,6 +14,6 @@ javac.debug=on
 javac.nowarn=off
 javac.verbose=yes
 # build.rmic=kaffe
-build.compiler=javac1.5
+# build.compiler=javac1.5
 compile.debug=on
 compile.optimize=on
diff --git a/debian/changelog b/debian/changelog
index ac1d8eb..7d20e6c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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)
diff --git a/debian/control b/debian/control
index 1f70f7f..12a21fa 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,8 @@ Uploaders: Jan-Pascal van Best <janpascal at vanbest.org>, Barry Hawkins <barry at all
  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), 
diff --git a/debian/rules b/debian/rules
index 6d718bf..813604c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,8 +22,8 @@ DEBIAN_ARCH := $(shell dpkg-architecture  | grep ^DEB_BUILD_ARCH= | cut -c 16-)
 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 @@ build-indep-stamp: configure-stamp
 	$(ANT) build-contrib
 	$(ANT) war-demo
 	# Skipping (very time consuming) until production time...
-	# $(ANT) test
+	$(ANT) test
 	$(ANT) javadocs
 
 	touch build-indep-stamp

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/lucene2.git