[pkg-java] r6787 - trunk/libfonts-java/debian

[doko at alioth.debian.org]

Author: doko
Date: 2008-07-30 16:14:11 +0000 (Wed, 30 Jul 2008)
New Revision: 6787

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


Modified: trunk/libfonts-java/debian/changelog
===================================================================
--- trunk/libfonts-java/debian/changelog	2008-07-30 16:11:07 UTC (rev 6786)
+++ trunk/libfonts-java/debian/changelog	2008-07-30 16:14:11 UTC (rev 6787)
@@ -1,3 +1,9 @@
+libfonts-java (0.3.3-2ubuntu1) intrepid; urgency=low
+
+  * (Build-)depend on default-jre/-jdk.
+
+ -- Matthias Klose <doko at ubuntu.com>  Wed, 30 Jul 2008 16:11:44 +0000
+
 libfonts-java (0.3.3-2) unstable; urgency=low
 
   * upload to unstable 

Modified: trunk/libfonts-java/debian/control
===================================================================
--- trunk/libfonts-java/debian/control	2008-07-30 16:11:07 UTC (rev 6786)
+++ trunk/libfonts-java/debian/control	2008-07-30 16:14:11 UTC (rev 6787)
@@ -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), cdbs, java-gcj-compat-dev, ant, libjcommon-java (>= 1.0.10-1), libloader-java, libitext-java
+Build-Depends: debhelper (>= 5), cdbs, default-jdk, ant, libjcommon-java (>= 1.0.10-1), libloader-java, libitext-java
 Standards-Version: 3.7.3
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libfonts-java
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libfonts-java
@@ -12,7 +12,7 @@
 Package: libfonts-java
 Section: libs
 Architecture: all
-Depends: java-gcj-compat | java1-runtime | java2-runtime, libjcommon-java (>= 1.0.10-1), libloader-java
+Depends: default-jre | java1-runtime | java2-runtime, libjcommon-java (>= 1.0.10-1), libloader-java
 Recommends: libitext-java
 Suggests: libfonts-java-doc
 Description: Java fonts layouting library

Modified: trunk/libfonts-java/debian/rules
===================================================================
--- trunk/libfonts-java/debian/rules	2008-07-30 16:11:07 UTC (rev 6786)
+++ trunk/libfonts-java/debian/rules	2008-07-30 16:14:11 UTC (rev 6787)
@@ -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 jcommon libloader