[pkg-java] r6794 - trunk/libjakarta-poi-java/debian

[doko at alioth.debian.org]

Author: doko
Date: 2008-07-30 17:50:23 +0000 (Wed, 30 Jul 2008)
New Revision: 6794

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


Modified: trunk/libjakarta-poi-java/debian/changelog
===================================================================
--- trunk/libjakarta-poi-java/debian/changelog	2008-07-30 17:46:43 UTC (rev 6793)
+++ trunk/libjakarta-poi-java/debian/changelog	2008-07-30 17:50:23 UTC (rev 6794)
@@ -1,3 +1,9 @@
+libjakarta-poi-java (3.0.2.dfsg-2) UNRELEASED; urgency=low
+
+  * (Build-)depend on default-jre/-jdk.
+
+ -- Matthias Klose <doko at debian.org>  Wed, 30 Jul 2008 17:47:09 +0000
+
 libjakarta-poi-java (3.0.2.dfsg-1) unstable; urgency=low
 
   * New upstream release.

Modified: trunk/libjakarta-poi-java/debian/control
===================================================================
--- trunk/libjakarta-poi-java/debian/control	2008-07-30 17:46:43 UTC (rev 6793)
+++ trunk/libjakarta-poi-java/debian/control	2008-07-30 17:50:23 UTC (rev 6794)
@@ -3,13 +3,13 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Christian Bayle <bayle at debian.org>, Arnaud Vandyck <avdyk at debian.org>, Rene Engelhard <rene at debian.org>, Michael Koch <konqueror at gmx.de>
-Build-Depends: debhelper (>= 4.2.30), cdbs, ant, ant-optional, junit, java-gcj-compat-dev, libcommons-logging-java, liblog4j1.2-java, libxalan2-java, libcommons-beanutils-java, libcommons-lang-java
+Build-Depends: debhelper (>= 4.2.30), cdbs, ant, ant-optional, junit, default-jdk, libcommons-logging-java, liblog4j1.2-java, libxalan2-java, libcommons-beanutils-java, libcommons-lang-java
 Standards-Version: 3.7.3
 
 Package: libjakarta-poi-java
 Section: libs
 Architecture: all
-Depends: java-gcj-compat | java1-runtime | java2-runtime, libcommons-logging-java, liblog4j1.2-java, libxalan2-java, libcommons-beanutils-java, libcommons-lang-java
+Depends: default-jre-headless | java1-runtime-headless | java2-runtime-headless, libcommons-logging-java, liblog4j1.2-java, libxalan2-java, libcommons-beanutils-java, libcommons-lang-java
 Suggests: java-virtual-machine, libjakarta-poi-java-doc
 Description: Poor Obfuscation Implementation
  The POI project consists of APIs for manipulating various file formats 

Modified: trunk/libjakarta-poi-java/debian/rules
===================================================================
--- trunk/libjakarta-poi-java/debian/rules	2008-07-30 17:46:43 UTC (rev 6793)
+++ trunk/libjakarta-poi-java/debian/rules	2008-07-30 17:50:23 UTC (rev 6794)
@@ -10,7 +10,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-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-junit.jar junit xalan2