[pkg-java] r6789 - trunk/libformula/debian

[doko at alioth.debian.org]

Author: doko
Date: 2008-07-30 17:26:15 +0000 (Wed, 30 Jul 2008)
New Revision: 6789

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


Modified: trunk/libformula/debian/changelog
===================================================================
--- trunk/libformula/debian/changelog	2008-07-30 17:18:54 UTC (rev 6788)
+++ trunk/libformula/debian/changelog	2008-07-30 17:26:15 UTC (rev 6789)
@@ -1,3 +1,9 @@
+libformula (0.1.14-2) UNRELEASED; urgency=low
+
+  * (Build-)depend on default-jre/-jdk.
+
+ -- Matthias Klose <doko at debian.org>  Wed, 30 Jul 2008 17:22:00 +0000
+
 libformula (0.1.14-1) unstable; urgency=medium
 
   * New upstream release

Modified: trunk/libformula/debian/control
===================================================================
--- trunk/libformula/debian/control	2008-07-30 17:18:54 UTC (rev 6788)
+++ trunk/libformula/debian/control	2008-07-30 17:26:15 UTC (rev 6789)
@@ -3,13 +3,13 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Rene Engelhard <rene at debian.org>
-Build-Depends: debhelper (>= 4.2.30), cdbs, java-gcj-compat-dev, ant, libjcommon-java (>= 1.0.10-1), javacc, ant-optional
+Build-Depends: debhelper (>= 4.2.30), cdbs, default-jdk, ant, libjcommon-java (>= 1.0.10-1), javacc, ant-optional
 Standards-Version: 3.6.2
 
 Package: libformula-java
 Section: libs
 Architecture: all
-Depends: java-gcj-compat | java1-runtime | java2-runtime, libjcommon-java (>= 1.0.10-1)
+Depends: default-jre-headless | java1-runtime-headless | java2-runtime-headless, libjcommon-java (>= 1.0.10-1)
 Suggests: libformula-java-doc
 Description: Excel(tm) style formula expressions library
  LibFormula provides Excel-Style-Expressions. The implementation provided

Modified: trunk/libformula/debian/rules
===================================================================
--- trunk/libformula/debian/rules	2008-07-30 17:18:54 UTC (rev 6788)
+++ trunk/libformula/debian/rules	2008-07-30 17:26:15 UTC (rev 6789)
@@ -5,7 +5,7 @@
 include /usr/share/cdbs/1/class/ant.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-JAVA_HOME := /usr/lib/jvm/java-gcj
+JAVA_HOME := /usr/lib/jvm/default-java
 ANT_HOME := /usr/share/ant
 
 DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar $(ANT_HOME)/lib/ant-nodeps.jar jcommon