[pkg-java] r10187 - trunk/libhibernate3-java/debian

[Torsten Werner]

Author: twerner
Date: 2009-08-23 20:27:41 +0000 (Sun, 23 Aug 2009)
New Revision: 10187

Modified:
   trunk/libhibernate3-java/debian/build.xml
   trunk/libhibernate3-java/debian/changelog
   trunk/libhibernate3-java/debian/rules
Log:
UNRELEASED
* Really switch to default-java. (Closes: #543085)
* Set nowarn="true" in javac task in debian/build.xml.

Modified: trunk/libhibernate3-java/debian/build.xml
===================================================================
--- trunk/libhibernate3-java/debian/build.xml	2009-08-23 20:14:34 UTC (rev 10186)
+++ trunk/libhibernate3-java/debian/build.xml	2009-08-23 20:27:41 UTC (rev 10187)
@@ -36,21 +36,21 @@
       debug="true" source="1.5"/>
 
     <javac srcdir="${ehcache.source.dir}" destdir="${class.dir}"
-      debug="true" source="1.5"/>
+      debug="true" nowarn="true" source="1.5"/>
     <javac srcdir="${jbosscache.source.dir}" destdir="${class.dir}"
-      debug="true" source="1.5" classpath="/usr/share/java/jboss-cache1.jar"/>
+      debug="true" nowarn="true" source="1.5" classpath="/usr/share/java/jboss-cache1.jar"/>
     <javac srcdir="${jbosscache2.source.dir}" destdir="${class.dir}"
-      debug="true" source="1.5" classpath="/usr/share/java/jboss-cache2.jar"/>
+      debug="true" nowarn="true" source="1.5" classpath="/usr/share/java/jboss-cache2.jar"/>
     <javac srcdir="${oscache.source.dir}" destdir="${class.dir}"
-      debug="true" source="1.5"/>
+      debug="true" nowarn="true" source="1.5"/>
     <javac srcdir="${swarmcache.source.dir}" destdir="${class.dir}"
-      debug="true" source="1.5"/>
+      debug="true" nowarn="true" source="1.5"/>
     <javac srcdir="${c3p0.source.dir}" destdir="${class.dir}"
-      debug="true" source="1.5"/>
+      debug="true" nowarn="true" source="1.5"/>
     <javac srcdir="${proxool.source.dir}" destdir="${class.dir}"
-      debug="true" source="1.5"/>
+      debug="true" nowarn="true" source="1.5"/>
     <javac srcdir="${jmx.source.dir}" destdir="${class.dir}"
-      debug="true" source="1.5"/>
+      debug="true" nowarn="true" source="1.5"/>
     <copy todir="${class.dir}">
 	<fileset dir="${resources.dir}">
 		<patternset refid="compiler.resources" />

Modified: trunk/libhibernate3-java/debian/changelog
===================================================================
--- trunk/libhibernate3-java/debian/changelog	2009-08-23 20:14:34 UTC (rev 10186)
+++ trunk/libhibernate3-java/debian/changelog	2009-08-23 20:27:41 UTC (rev 10187)
@@ -1,3 +1,11 @@
+libhibernate3-java (3.3.1.GA+dak1-4) unstable; urgency=low
+
+  UNRELEASED
+  * Really switch to default-java. (Closes: #543085)
+  * Set nowarn="true" in javac task in debian/build.xml.
+
+ -- Torsten Werner <twerner at debian.org>  Sun, 23 Aug 2009 22:13:38 +0200
+
 libhibernate3-java (3.3.1.GA+dak1-3) unstable; urgency=low
 
   * Build jboss-cache2, c3p0 and proxool components.

Modified: trunk/libhibernate3-java/debian/rules
===================================================================
--- trunk/libhibernate3-java/debian/rules	2009-08-23 20:14:34 UTC (rev 10186)
+++ trunk/libhibernate3-java/debian/rules	2009-08-23 20:27:41 UTC (rev 10187)
@@ -4,7 +4,7 @@
 include /usr/share/cdbs/1/class/ant.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
-JAVA_HOME		:= /usr/lib/jvm/java-gcj/
+JAVA_HOME		:= /usr/lib/jvm/default-java
 DEB_ANT_BUILDFILE	:= debian/build.xml
 DEB_ANT_BUILD_TARGET	:= jar javadoc
 DEB_JARS		:= ant-antlr ant-junit antlr asm-attrs ehcache cglib commons-collections3 \