[commons-csv] 10/35: Build with OpenJDK

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository commons-csv.

commit 8a00b158e9abf4cc6a09beaaebe02cf883f97baa
Author: Jan-Pascal van Best <janpascal at vanbest.org>
Date:   Tue Sep 9 11:14:48 2008 +0000

    Build with OpenJDK
---
 build.xml        | 3 ++-
 debian/changelog | 3 ++-
 debian/control   | 4 ++--
 debian/rules     | 4 ++--
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/build.xml b/build.xml
index 8ef56c0..2ec9b5e 100644
--- a/build.xml
+++ b/build.xml
@@ -43,7 +43,8 @@
   <target name="compile" description="o Compile the code">
     <mkdir dir="${classesdir}">
     </mkdir>
-    <javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
+    <javac destdir="${classesdir}" deprecation="true" debug="true"
+    optimize="true" excludes="**/package.html" source="1.4" target="1.4">
       <src>
         <pathelement location="src/java">
         </pathelement>
diff --git a/debian/changelog b/debian/changelog
index 216a974..9c75629 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,8 +13,9 @@ commons-csv (0.1-SNAPSHOT+svn678580-1) UNRELEASED; urgency=low
   * Remove full Apache license from debian/copyright and referred to 
     /usr/share/common-licenses instead.
   * Added DM-Upload-Allowed: yes to debian/control.
+  * Compile with OpenJDK (instead of gcj).
 
- -- Jan-Pascal van Best <janpascal at vanbest.org>  Tue, 09 Sep 2008 12:10:16 +0200
+ -- Jan-Pascal van Best <janpascal at vanbest.org>  Tue, 09 Sep 2008 13:14:12 +0200
 
 commons-csv (0.1-SNAPSHOT+svn558885-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 39b881b..2c5cb53 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.or
 Uploaders: Jan-Pascal van Best <janpascal at vanbest.org>
 DM-Upload-Allowed: yes
 Build-Depends: debhelper (>= 5.0.0), cdbs (>=0.4.48), dpatch (>= 2.0),
- java-gcj-compat-dev, ant-optional (>= 1.6.5), junit (>= 3.8.1)
+ openjdk-6-jdk, ant-optional (>= 1.6.5), junit (>= 3.8.1)
 Standards-Version: 3.8.0
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/commons-csv
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/commons-csv
@@ -13,7 +13,7 @@ Homepage: http://jakarta.apache.org/commons/sandbox/csv/
 
 Package: libcommons-csv-java
 Architecture: all
-Depends: java-gcj-compat | java1-runtime | java2-runtime
+Depends: openjdk-6-jre | java2-runtime
 Suggests: java-virtual-machine
 Description: a Java library for working with csv (comma separated values) files
  libcommons-csv-java is the Apache Commons library for working with csv (comma
diff --git a/debian/rules b/debian/rules
index 56582ce..2340f6e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,8 +8,8 @@ include /usr/share/cdbs/1/class/ant.mk
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# Use gcj
-JAVA_HOME = /usr/lib/jvm/java-gcj
+# Use OpenJDK
+JAVA_HOME = /usr/lib/jvm/java-6-openjdk
 
 DEB_ANT_BUILD_TARGET = init compile jar javadoc
 

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