diff -u jabref-2.3.1/debian/control jabref-2.3.1/debian/control
--- jabref-2.3.1/debian/control
+++ jabref-2.3.1/debian/control
@@ -1,10 +1,11 @@
 Source: jabref
 Section: contrib/tex
 Priority: optional
-Maintainer: gregor herrmann <gregoa@debian.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: gregor herrmann <gregoa@debian.org>
 Uploaders: tony mancill <tmancill@debian.org>
 Build-Depends: debhelper (>= 6), quilt (>= 0.40), ant
-Build-Depends-Indep: default-jdk-builddep, imagemagick, liblog4j1.2-java,
+Build-Depends-Indep: default-jdk, imagemagick, liblog4j1.2-java,
  antlr, antlr3, libjgoodies-looks-java, libjgoodies-forms-java, libspin-java,
  libglazedlists-java, libmicroba-java, libpdfbox-java, libjempbox-java (>= 0.2.0)
 Standards-Version: 3.8.0
@@ -14,7 +15,7 @@
 
 Package: jabref
 Architecture: all
-Depends: openjdk-6-jre | sun-java6-jre | sun-java5-jre, antlr, antlr3,
+Depends: default-jre | java2-runtime, antlr, antlr3,
  libjgoodies-looks-java, libjgoodies-forms-java, libspin-java,
  libglazedlists-java, libmicroba-java, libpdfbox-java,
  libjempbox-java (>= 0.2.0)
diff -u jabref-2.3.1/debian/changelog jabref-2.3.1/debian/changelog
--- jabref-2.3.1/debian/changelog
+++ jabref-2.3.1/debian/changelog
@@ -1,3 +1,19 @@
+jabref (2.3.1-5ubuntu1) intrepid; urgency=low
+
+  * Merge from debian unstable. (LP: #225450, #227125)
+  * Remaining changes:
+    - debian/control
+      * Change build dependency default-jdk-builddep to default-jdk.
+      * Change run time dependency to default-jre | java2-runtime.
+        There is no evidence that it does not run with latest Free JVMs.
+        (LP: #164216, #194509)
+      * Modify Maintainer value to match the DebianMaintainerField
+        specification.
+    - debian/rules
+      * Change JAVA_HOME for default-jdk.
+
+ -- Onkar Shinde <onkarshinde@ubuntu.com>  Sat, 09 Aug 2008 14:51:41 +0530
+
 jabref (2.3.1-5) unstable; urgency=low
 
   * Change runtime dependency from "sun-java6-jre | sun-java5-jre" to
@@ -61,6 +77,24 @@
 
  -- gregor herrmann <gregor+debian@comodo.priv.at>  Mon, 11 Feb 2008 17:00:15 +0100
 
+jabref (2.3.1-1ubuntu2) hardy; urgency=low
+
+  * debian/control:
+    - Replace icedtea-java7 dependencies with openjdk-6 (LP: #203636)
+    - Bump Debian standards version to 3.7.3, No changes.
+
+ -- David Futcher <bobbocanfly@gmail.com>  Wed, 19 Mar 2008 15:50:58 +0000
+
+jabref (2.3.1-1ubuntu1) hardy; urgency=low
+
+  [ Kai-Cheung Leung ]
+  * Now built with icedtea-java7 (closes: #194509, #162857)
+
+  [ Emmet Hikory ]
+  * Set Ubuntu Maintainer
+
+ -- Emmet Hikory <persia@ubuntu.com>  Sun, 02 Mar 2008 11:35:49 +0900
+
 jabref (2.3.1-1) unstable; urgency=low
 
   * New upstream release.
diff -u jabref-2.3.1/debian/rules jabref-2.3.1/debian/rules
--- jabref-2.3.1/debian/rules
+++ jabref-2.3.1/debian/rules
@@ -14,7 +14,7 @@
 build: build-stamp
 build-stamp: $(QUILT_STAMPFN)
 	dh_testdir
-	JAVA_HOME=/usr/lib/jvm/java-gcj ant jars
+	JAVA_HOME=/usr/lib/jvm/default-java ant jars
 	convert -geometry 32x32 src/images/JabRef-icon-48.png build/jabref32.xpm
 	convert -geometry 16x16 src/images/JabRef-icon-48.png build/jabref16.xpm
 	touch build-stamp
only in patch2:
unchanged: