[pkg-java] r14972 - trunk/mina2/debian

[Miguel Landaeta]

Author: nomadium-guest
Date: 2011-09-21 01:50:56 +0000 (Wed, 21 Sep 2011)
New Revision: 14972

Modified:
   trunk/mina2/debian/changelog
   trunk/mina2/debian/control
   trunk/mina2/debian/rules
Log:
Switch to default-jdk

Modified: trunk/mina2/debian/changelog
===================================================================
--- trunk/mina2/debian/changelog	2011-09-21 01:24:37 UTC (rev 14971)
+++ trunk/mina2/debian/changelog	2011-09-21 01:50:56 UTC (rev 14972)
@@ -1,3 +1,10 @@
+mina2 (2.0.4+dfsg-2) UNRELEASED; urgency=low
+
+  * Team upload.
+  * Switch to default-jdk. (Closes: #642279).
+
+ -- Miguel Landaeta <miguel at miguel.cc>  Tue, 20 Sep 2011 21:12:47 -0430
+
 mina2 (2.0.4+dfsg-1) unstable; urgency=low
 
   [ Miguel Landaeta ]

Modified: trunk/mina2/debian/control
===================================================================
--- trunk/mina2/debian/control	2011-09-21 01:24:37 UTC (rev 14971)
+++ trunk/mina2/debian/control	2011-09-21 01:50:56 UTC (rev 14972)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Damien Raude-Morvan <drazzib at debian.org>
-Build-Depends: debhelper (>= 7), ant, cdbs, openjdk-6-jdk
+Build-Depends: debhelper (>= 7), ant, cdbs, default-jdk
 Build-Depends-Indep: libslf4j-java, libjzlib-java,
   libmx4j-java, libspring-beans-java, libtomcat6-java, libognl-java, librxtx-java,
   maven-repo-helper

Modified: trunk/mina2/debian/rules
===================================================================
--- trunk/mina2/debian/rules	2011-09-21 01:24:37 UTC (rev 14971)
+++ trunk/mina2/debian/rules	2011-09-21 01:50:56 UTC (rev 14972)
@@ -3,8 +3,7 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/ant.mk
 
-# Use OpenJDK6 to compile Java 1.5 source files
-JAVA_HOME := /usr/lib/jvm/java-6-openjdk
+JAVA_HOME := /usr/lib/jvm/default-java
 
 DEB_JARS  := slf4j-api jzlib mx4j spring3-core spring3-beans ognl \
              /usr/share/tomcat6/lib/tomcat-coyote.jar \