[lucene2] 49/104: Use openjdk-6 instead of sun-java-5

[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 e661f6c21f813dc8fb76f4a975edc89fac327109
Author: Jan-Pascal van Best <janpascal at vanbest.org>
Date:   Fri Jul 25 18:05:13 2008 +0000

    Use openjdk-6 instead of sun-java-5
---
 debian/README.Debian | 2 --
 debian/TODO.Debian   | 1 -
 debian/changelog     | 6 ++++++
 debian/control       | 6 +++---
 debian/rules         | 5 ++---
 5 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/debian/README.Debian b/debian/README.Debian
index 199926d..3480ef7 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -8,8 +8,6 @@ There are two binary packages:
   docs, and example applications
 
 Not all contrib libraries are included:
-- db/bdb-je depends on je-2.0.90 from www.sleepycat.com, not
-  in Debian
 - gdata-server depends on many libraries, of which at least the 
   Google Data API (com.google.gdata) packages are not in Debian
 
diff --git a/debian/TODO.Debian b/debian/TODO.Debian
index a53ebc8..1936405 100644
--- a/debian/TODO.Debian
+++ b/debian/TODO.Debian
@@ -4,5 +4,4 @@ TODO
 Stuff to do regarding packaging of lucene-2.x.x:
 
 - Split into -core and -contrib package (maybe even further split up -contrib).
-- Try to use gcj instead of Sun java. Maybe just for -core.
 
diff --git a/debian/changelog b/debian/changelog
index eac2652..18cf934 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+lucene2 (2.3.2+ds1-2) unstable; urgency=low
+
+  * Use openjdk to build lucene2
+
+ -- Jan-Pascal van Best <janpascal at vanbest.org>  Fri, 25 Jul 2008 17:40:42 +0200
+
 lucene2 (2.3.2+ds1-1) unstable; urgency=low
 
   * New upstream release 
diff --git a/debian/control b/debian/control
index 7c5e0df..dee26cd 100644
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,5 @@
 Source: lucene2
-Section: contrib/text
+Section: text
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Jan-Pascal van Best <janpascal at vanbest.org>, Barry Hawkins <barry at alltc.com>, 
@@ -8,7 +8,7 @@ Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/lucene2/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/lucene2/
 Homepage: http://lucene.apache.org/java/
 Build-Depends: cdbs (>= 0.4.49), debhelper (>= 6), dpatch (>= 2.0),
- sun-java5-jre, sun-java5-jdk, 
+ openjdk-6-jdk, 
  ant-optional, javacc, junit
 Build-Depends-Indep: libjtidy-java (>= 7),
  libjline-java (>= 0.9.5), 
@@ -23,7 +23,7 @@ Standards-Version: 3.7.3
 
 Package: liblucene2-java
 Architecture: all
-Depends: sun-java5-jre | sun-java6-jre,
+Depends: openjdk-6-jre | java5-runtime,
  libjtidy-java (>= 7),
  libjline-java (>= 0.9.5), 
  libcommons-digester-java (>= 1.7), 
diff --git a/debian/rules b/debian/rules
index 8662a62..3308790 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,9 +10,8 @@ include /usr/share/cdbs/1/class/ant.mk
 
 DEB_INSTALL_CHANGELOGS_liblucene2-java := CHANGES.txt
 
-# Build with Sun JDK 1.5
-JAVA_HOME := /usr/lib/jvm/java-1.5.0-sun
-# JAVA_HOME := /usr/lib/jvm/java-gcj
+# Build with OpenJDK
+JAVA_HOME := /usr/lib/jvm/java-6-openjdk
 
 DEB_ANT_BUILD_TARGET := javacc jar-core build-contrib war-demo javadocs
 DEB_ANT_CHECK_TARGET := test

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