diff -u omegat-1.7.3.u2+dfsg/debian/control omegat-1.7.3.u2+dfsg/debian/control
--- omegat-1.7.3.u2+dfsg/debian/control
+++ omegat-1.7.3.u2+dfsg/debian/control
@@ -1,9 +1,10 @@
 Source: omegat
 Section: contrib/editors
 Priority: optional
-Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
 Uploaders: Tiago Saboga <tiagosaboga@gmail.com>
-Build-Depends: debhelper (>= 5), sun-java5-jdk, dpatch, ant
+Build-Depends: debhelper (>= 5), default-jdk-builddep | sun-java5-jdk, dpatch, ant
 Build-Depends-Indep: docbook-to-man, imagemagick, libvldocking-java, libhtmlparser-java, tofrodos
 Homepage: http://www.omegat.org/omegat/omegat.html
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/omegat
@@ -12,7 +13,7 @@
 
 Package: omegat
 Architecture: all
-Depends: sun-java6-jre | sun-java5-jre | sun-j2sdk1.5 | sun-j2re1.5, libvldocking-java, libhtmlparser-java
+Depends: default-jre-runtime | sun-java6-jre | sun-java5-jre | sun-j2sdk1.5 | sun-j2re1.5 | java2-runtime, libvldocking-java, libhtmlparser-java
 Description: Computer Assisted Translation (CAT) tool
  OmegaT's main features are
   - ability to run on any operating system supporting Java
diff -u omegat-1.7.3.u2+dfsg/debian/ant.properties omegat-1.7.3.u2+dfsg/debian/ant.properties
--- omegat-1.7.3.u2+dfsg/debian/ant.properties
+++ omegat-1.7.3.u2+dfsg/debian/ant.properties
@@ -1,3 +1,5 @@
+ant.build.javac.source=1.5
+ant.build.javac.target=1.5
 file.reference.htmlparser.jar=/usr/share/java/libhtmlparser.jar
 file.reference.vldocking_2.0.6d.jar=/usr/share/java/vldocking.jar
 javac.classpath=\
diff -u omegat-1.7.3.u2+dfsg/debian/rules omegat-1.7.3.u2+dfsg/debian/rules
--- omegat-1.7.3.u2+dfsg/debian/rules
+++ omegat-1.7.3.u2+dfsg/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 include /usr/share/dpatch/dpatch.make
 
-JAVA_HOME=/usr/lib/jvm/java-1.5.0-sun
+JAVA_HOME=/usr/lib/jvm/default-java
 ANT_OPTIONS=-propertyfile debian/ant.properties
 
 configure: configure-stamp
diff -u omegat-1.7.3.u2+dfsg/debian/changelog omegat-1.7.3.u2+dfsg/debian/changelog
--- omegat-1.7.3.u2+dfsg/debian/changelog
+++ omegat-1.7.3.u2+dfsg/debian/changelog
@@ -1,3 +1,22 @@
+omegat (1.7.3.u2+dfsg-1ubuntu1) intrepid; urgency=low
+
+  * Fix FTBFS by using GCJ as build dependency since package is in universe.
+    (LP: #251590)
+  * debian/control
+    - Use default-jdk as build depends.
+    - Add default-jre and java2-runtime in runtime dependencies.
+    - Modify Maintainer value to match the DebianMaintainerField
+      specification.
+  * debian/rules
+    - Set JAVA_HOME corresponding to default-jdk.
+  * debain/ant.properties
+    - Set default source and target values to 1.5.
+  * debian/patches
+    - 02-edit-wrapper.dpatch - No need to look for Sun java specifically, as
+      the applications runs with GIJ.
+
+ -- Onkar Shinde <onkarshinde@gmail.com>  Thu, 24 Jul 2008 23:55:55 +0530
+
 omegat (1.7.3.u2+dfsg-1) unstable; urgency=low
 
   * New upstream release.
diff -u omegat-1.7.3.u2+dfsg/debian/patches/02-edit-wrapper.dpatch omegat-1.7.3.u2+dfsg/debian/patches/02-edit-wrapper.dpatch
--- omegat-1.7.3.u2+dfsg/debian/patches/02-edit-wrapper.dpatch
+++ omegat-1.7.3.u2+dfsg/debian/patches/02-edit-wrapper.dpatch
@@ -7,21 +7,11 @@
-## DP: - look for sun's java vm
 
 @DPATCH@
-diff -urNad omegat-1.7.2.dfsg0~/release/OmegaT omegat-1.7.2.dfsg0/release/OmegaT
---- omegat-1.7.2.dfsg0~/release/OmegaT	2007-06-18 15:26:40.000000000 -0300
-+++ omegat-1.7.2.dfsg0/release/OmegaT	2007-11-10 12:36:24.000000000 -0200
-@@ -1,3 +1,12 @@
+diff -urNad omegat-1.7.3.u2+dfsg~/release/OmegaT omegat-1.7.3.u2+dfsg/release/OmegaT
+--- omegat-1.7.3.u2+dfsg~/release/OmegaT	2008-03-28 19:49:26.000000000 +0530
++++ omegat-1.7.3.u2+dfsg/release/OmegaT	2008-07-25 00:01:25.000000000 +0530
+@@ -1,3 +1,3 @@
 -#!/bin/bash
 -java -jar OmegaT.jar $*
 +#!/bin/sh
  
-+if [ -x /usr/lib/jvm/java-6-sun/bin/java ]
-+    then JAVABIN=/usr/lib/jvm/java-6-sun/bin/java
-+elif [ -x /usr/lib/jvm/java-1.5.0-sun/bin/java ]
-+    then JAVABIN=/usr/lib/jvm/java-1.5.0-sun/bin/java
-+else
-+    echo "I could not find a suitable java binary."
-+    exit 1
-+fi
-+
-+exec $JAVABIN -jar /usr/share/java/OmegaT.jar $*
++exec /usr/bin/java -jar /usr/share/java/OmegaT.jar $*