diff -pruN 1.0.0-OOo31-2/debian/changelog 1.0.0-OOo31-2ubuntu1/debian/changelog
--- 1.0.0-OOo31-2/debian/changelog	2009-05-11 22:28:30.000000000 +0100
+++ 1.0.0-OOo31-2ubuntu1/debian/changelog	2009-05-11 22:23:50.000000000 +0100
@@ -1,3 +1,10 @@
+libfonts-openoffice.org (1.0.0-OOo31-2ubuntu1) karmic; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - default-java transition.
+
+ -- Chris Cheney <ccheney@ubuntu.com>  Mon, 11 May 2009 13:25:00 -0500
+
 libfonts-openoffice.org (1.0.0-OOo31-2) unstable; urgency=low
 
   * upload to unstable 
diff -pruN 1.0.0-OOo31-2/debian/control 1.0.0-OOo31-2ubuntu1/debian/control
--- 1.0.0-OOo31-2/debian/control	2009-05-11 22:28:30.000000000 +0100
+++ 1.0.0-OOo31-2ubuntu1/debian/control	2009-05-11 22:23:50.000000000 +0100
@@ -3,14 +3,14 @@ Section: libs
 Priority: optional
 Maintainer: Debian OpenOffice Team <debian-openoffice@lists.debian.org>
 Uploaders: Rene Engelhard <rene@debian.org>
-Build-Depends: debhelper (>= 5), cdbs, java-gcj-compat-dev, ant, libcommons-logging-java, libbase-java-openoffice.org, libloader-java-openoffice.org
+Build-Depends: debhelper (>= 5), cdbs, default-jdk, ant, libcommons-logging-java, libbase-java-openoffice.org, libloader-java-openoffice.org
 Standards-Version: 3.7.3
 Homepage: http://jfreereport.sourceforge.net/
 
 Package: libfonts-java-openoffice.org
 Section: libs
 Architecture: all
-Depends: java-gcj-compat | java1-runtime | java2-runtime, libcommons-logging-java, libbase-java-openoffice.org, libloader-java-openoffice.org, ${misc:Depends}
+Depends: default-jre-headless | java2-runtime-headless, libcommons-logging-java, libbase-java-openoffice.org, libloader-java-openoffice.org, ${misc:Depends}
 Description: Java fonts layouting library (OOo 3.1 branch)
  LibFonts is a library developed to support advanced layouting and allows to
  read TrueType-Font files to extract layouting specific informations
diff -pruN 1.0.0-OOo31-2/debian/rules 1.0.0-OOo31-2ubuntu1/debian/rules
--- 1.0.0-OOo31-2/debian/rules	2009-05-11 22:28:30.000000000 +0100
+++ 1.0.0-OOo31-2ubuntu1/debian/rules	2009-05-11 22:23:50.000000000 +0100
@@ -5,7 +5,7 @@ include /usr/share/cdbs/1/rules/debhelpe
 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 commons-logging openoffice/libbase openoffice/libloader