[pkg-java] r10548 - trunk/jexcelapi/debian

[Torsten Werner]

Author: twerner
Date: 2009-09-23 20:56:25 +0000 (Wed, 23 Sep 2009)
New Revision: 10548

Modified:
   trunk/jexcelapi/debian/changelog
   trunk/jexcelapi/debian/control
   trunk/jexcelapi/debian/rules
Log:
Switch to default-java.

Modified: trunk/jexcelapi/debian/changelog
===================================================================
--- trunk/jexcelapi/debian/changelog	2009-09-23 16:17:25 UTC (rev 10547)
+++ trunk/jexcelapi/debian/changelog	2009-09-23 20:56:25 UTC (rev 10548)
@@ -1,3 +1,9 @@
+jexcelapi (2.6.10-2) unstable; urgency=low
+
+  * Switch to default-java.
+
+ -- Torsten Werner <twerner at debian.org>  Wed, 23 Sep 2009 22:53:58 +0200
+
 jexcelapi (2.6.10-1) unstable; urgency=low
 
   * new upstream release

Modified: trunk/jexcelapi/debian/control
===================================================================
--- trunk/jexcelapi/debian/control	2009-09-23 16:17:25 UTC (rev 10547)
+++ trunk/jexcelapi/debian/control	2009-09-23 20:56:25 UTC (rev 10548)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Torsten Werner <twerner at debian.org>
-Build-Depends: ant, cdbs, debhelper (>= 5), java-gcj-compat-dev
+Build-Depends: ant, cdbs, debhelper (>= 5), default-jdk
 Standards-Version: 3.8.1
 Homepage: http://jexcelapi.sourceforge.net
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/jexcelapi/
@@ -11,7 +11,7 @@
 
 Package: libjexcelapi-java
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, kaffe | java1-runtime | java2-runtime
+Depends: ${shlibs:Depends}, ${misc:Depends}, default-jre-headless | java2-runtime
 Suggests: java-virtual-machine
 Description: Java API to read, write and modify Excel spreadsheets
  The Java Excel API is an open source Java API which allows Java developers to

Modified: trunk/jexcelapi/debian/rules
===================================================================
--- trunk/jexcelapi/debian/rules	2009-09-23 16:17:25 UTC (rev 10547)
+++ trunk/jexcelapi/debian/rules	2009-09-23 20:56:25 UTC (rev 10548)
@@ -4,7 +4,7 @@
 include /usr/share/cdbs/1/class/ant.mk
 
 DEB_BUILDDIR         := build
-JAVA_HOME            := /usr/lib/jvm/java-gcj
+JAVA_HOME            := /usr/lib/jvm/default-java
 DEB_ANT_BUILD_TARGET := jxl docs
 DEB_ANT_CLEAN_TARGET := clean