[pkg-java] r10517 - trunk/libjboss-cache1-java/debian

[Torsten Werner]

Author: twerner
Date: 2009-09-20 16:27:52 +0000 (Sun, 20 Sep 2009)
New Revision: 10517

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

Modified: trunk/libjboss-cache1-java/debian/changelog
===================================================================
--- trunk/libjboss-cache1-java/debian/changelog	2009-09-20 16:19:40 UTC (rev 10516)
+++ trunk/libjboss-cache1-java/debian/changelog	2009-09-20 16:27:52 UTC (rev 10517)
@@ -6,8 +6,9 @@
   * Add README.source.
   * Improve Vcs-Svn header.
   * Update Standards-Version: 3.8.3.
+  * Switch to default-java.
 
- -- Torsten Werner <twerner at debian.org>  Sun, 20 Sep 2009 18:16:52 +0200
+ -- Torsten Werner <twerner at debian.org>  Sun, 20 Sep 2009 18:20:50 +0200
 
 libjboss-cache1-java (1.4.1.SP12-1) unstable; urgency=low
 

Modified: trunk/libjboss-cache1-java/debian/control
===================================================================
--- trunk/libjboss-cache1-java/debian/control	2009-09-20 16:19:40 UTC (rev 10516)
+++ trunk/libjboss-cache1-java/debian/control	2009-09-20 16:27:52 UTC (rev 10517)
@@ -4,11 +4,11 @@
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Varun Hiremath <varun at debian.org>, Torsten Werner <twerner at debian.org>
 Build-Depends: cdbs, debhelper (>= 5), quilt
-Build-Depends-Indep: ant, java-gcj-compat-dev, libdb-je-java, bsh,
+Build-Depends-Indep: ant, default-jdk, libdb-je-java, bsh,
  libjgroups-java, libcommons-logging-java, libjdbm-java,
  liblog4j1.2-java, libjboss-serialization-java, libjboss-system-java,
  libjboss-jmx-java, libjboss-common-java, libconcurrent-java,
- libjboss-aop-java, libjboss-server-java
+ libjboss-aop-java, libjboss-server-java, libjboss-j2ee-java
 Standards-Version: 3.8.3
 Homepage: http://labs.jboss.com/jbosscache/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libjboss-cache-java
@@ -16,8 +16,8 @@
 
 Package: libjboss-cache1-java
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends},
- java-gcj-compat | java1-runtime | java2-runtime
+Depends: ${shlibs:Depends}, ${misc:Depends}, default-jre-headless |
+ java2-runtime-headless
 Description: cache frequently accessed Java objects
  JBoss Cache is a product designed to cache frequently accessed Java
  objects in order to dramatically improve the performance of e-business

Modified: trunk/libjboss-cache1-java/debian/rules
===================================================================
--- trunk/libjboss-cache1-java/debian/rules	2009-09-20 16:19:40 UTC (rev 10516)
+++ trunk/libjboss-cache1-java/debian/rules	2009-09-20 16:27:52 UTC (rev 10517)
@@ -4,12 +4,12 @@
 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_BUILD_TARGET := jar
 DEB_ANT_BUILDFILE    := debian/build.xml
 DEB_JARS	     := jboss jboss-aop db-je bsh jgroups-core commons-logging \
 	jdbm log4j-1.2 jboss-serialization jboss-system jboss-jmx jboss-common \
-	concurrent
+	concurrent jboss-j2ee
 
 install/libjboss-cache1-java::
 	install -m 644 -D jboss-cache1.jar \