[pkg-java] r6984 - in trunk/commons-csv: . debian

[janpascal-guest at alioth.debian.org]

Author: janpascal-guest
Date: 2008-09-09 11:14:48 +0000 (Tue, 09 Sep 2008)
New Revision: 6984

Modified:
   trunk/commons-csv/build.xml
   trunk/commons-csv/debian/changelog
   trunk/commons-csv/debian/control
   trunk/commons-csv/debian/rules
Log:
Build with OpenJDK

Modified: trunk/commons-csv/build.xml
===================================================================
--- trunk/commons-csv/build.xml	2008-09-09 10:12:09 UTC (rev 6983)
+++ trunk/commons-csv/build.xml	2008-09-09 11:14:48 UTC (rev 6984)
@@ -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>

Modified: trunk/commons-csv/debian/changelog
===================================================================
--- trunk/commons-csv/debian/changelog	2008-09-09 10:12:09 UTC (rev 6983)
+++ trunk/commons-csv/debian/changelog	2008-09-09 11:14:48 UTC (rev 6984)
@@ -13,8 +13,9 @@
   * 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
 

Modified: trunk/commons-csv/debian/control
===================================================================
--- trunk/commons-csv/debian/control	2008-09-09 10:12:09 UTC (rev 6983)
+++ trunk/commons-csv/debian/control	2008-09-09 11:14:48 UTC (rev 6984)
@@ -5,7 +5,7 @@
 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 @@
 
 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

Modified: trunk/commons-csv/debian/rules
===================================================================
--- trunk/commons-csv/debian/rules	2008-09-09 10:12:09 UTC (rev 6983)
+++ trunk/commons-csv/debian/rules	2008-09-09 11:14:48 UTC (rev 6984)
@@ -8,8 +8,8 @@
 # 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