[pkg-java] r6801 - trunk/pentaho-reporting-flow-engine/debian

[doko at alioth.debian.org]

Author: doko
Date: 2008-07-30 18:48:30 +0000 (Wed, 30 Jul 2008)
New Revision: 6801

Modified:
   trunk/pentaho-reporting-flow-engine/debian/changelog
   trunk/pentaho-reporting-flow-engine/debian/control
   trunk/pentaho-reporting-flow-engine/debian/rules
Log:
* (Build-)depend on default-jre/-jdk.


Modified: trunk/pentaho-reporting-flow-engine/debian/changelog
===================================================================
--- trunk/pentaho-reporting-flow-engine/debian/changelog	2008-07-30 18:44:57 UTC (rev 6800)
+++ trunk/pentaho-reporting-flow-engine/debian/changelog	2008-07-30 18:48:30 UTC (rev 6801)
@@ -1,3 +1,9 @@
+pentaho-reporting-flow-engine (0.9.2-4) UNRELEASED; urgency=low
+
+  * (Build-)depend on default-jre/-jdk.
+
+ -- Matthias Klose <doko at debian.org>  Wed, 30 Jul 2008 18:45:22 +0000
+
 pentaho-reporting-flow-engine (0.9.2-3) unstable; urgency=low
 
   * add missing symlink for jfreereport.jar

Modified: trunk/pentaho-reporting-flow-engine/debian/control
===================================================================
--- trunk/pentaho-reporting-flow-engine/debian/control	2008-07-30 18:44:57 UTC (rev 6800)
+++ trunk/pentaho-reporting-flow-engine/debian/control	2008-07-30 18:48:30 UTC (rev 6801)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Rene Engelhard <rene at debian.org>, Michael Koch <konqueror at gmx.de>
-Build-Depends: debhelper (>> 5.0.0), java-gcj-compat-dev, ant, bsh, libjcommon-java (>= 1.0.10), libitext-java, libjakarta-poi-java, libpixie-java (>= 0.8.6), liblog4j1.2-java, dpatch, libjcommon-serializer-java, libformula-java, libflute-1.3-jfree-java, libfonts-java (>= 0.3.2), liblayout-java, libloader-java, librepository-java, libxml-java (>= 0.8.9), libsac-java, docbook-utils, docbook-xml
+Build-Depends: debhelper (>> 5.0.0), default-jdk, ant, bsh, libjcommon-java (>= 1.0.10), libitext-java, libjakarta-poi-java, libpixie-java (>= 0.8.6), liblog4j1.2-java, dpatch, libjcommon-serializer-java, libformula-java, libflute-1.3-jfree-java, libfonts-java (>= 0.3.2), liblayout-java, libloader-java, librepository-java, libxml-java (>= 0.8.9), libsac-java, docbook-utils, docbook-xml
 Standards-Version: 3.7.3
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/pentaho-reporting-flow-engine
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/pentaho-reporting-flow-engine
@@ -12,7 +12,7 @@
 Package: libpentaho-reporting-flow-engine-java
 Section: libs
 Architecture: all
-Depends: gij | java2-runtime, libjcommon-java (>= 1.0.10), libitext-java, libjakarta-poi-java, liblog4j1.2-java, libjcommon-serializer-java, libformula-java, libflute-1.3-jfree-java, libfonts-java (>= 0.3.2), liblayout-java, libloader-java, librepository-java, libxml-java (>= 0.8.9), libsac-java
+Depends: default-jre | java2-runtime, libjcommon-java (>= 1.0.10), libitext-java, libjakarta-poi-java, liblog4j1.2-java, libjcommon-serializer-java, libformula-java, libflute-1.3-jfree-java, libfonts-java (>= 0.3.2), liblayout-java, libloader-java, librepository-java, libxml-java (>= 0.8.9), libsac-java
 Conflicts: libjfreereport-java
 Provides: libjfreereport-java
 Replaces: libjfreereport-java

Modified: trunk/pentaho-reporting-flow-engine/debian/rules
===================================================================
--- trunk/pentaho-reporting-flow-engine/debian/rules	2008-07-30 18:44:57 UTC (rev 6800)
+++ trunk/pentaho-reporting-flow-engine/debian/rules	2008-07-30 18:48:30 UTC (rev 6801)
@@ -5,7 +5,7 @@
 
 # Build 
 # Choose the VM
-export JAVA_HOME ?= /usr/lib/jvm/java-gcj
+export JAVA_HOME ?= /usr/lib/jvm/default-java
 export JAVA=$(JAVA_HOME)/bin/java
 export JAVAC=$(JAVA_HOME)/bin/javac
 export CLASSPATH=$(JAVA_HOME)/jre/lib/rt.jar:.