diff -u lucene2-2.3.1+ds1/debian/rules lucene2-2.3.1+ds1/debian/rules
--- lucene2-2.3.1+ds1/debian/rules
+++ lucene2-2.3.1+ds1/debian/rules
@@ -10,9 +10,8 @@
 
 DEB_INSTALL_CHANGELOGS_liblucene2-java := CHANGES.txt
 
-# Build with Sun JDK 1.5
-JAVA_HOME := /usr/lib/jvm/java-1.5.0-sun
-# JAVA_HOME := /usr/lib/jvm/java-gcj
+# Build with openjdk-6
+JAVA_HOME := /usr/lib/jvm/java-6-openjdk
 
 DEB_ANT_BUILD_TARGET := javacc jar-core build-contrib war-demo javadocs
 DEB_ANT_CHECK_TARGET := test
diff -u lucene2-2.3.1+ds1/debian/control lucene2-2.3.1+ds1/debian/control
--- lucene2-2.3.1+ds1/debian/control
+++ lucene2-2.3.1+ds1/debian/control
@@ -1,14 +1,15 @@
 Source: lucene2
 Section: contrib/text
 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: Jan-Pascal van Best <janpascal@vanbest.org>, Barry Hawkins <barry@alltc.com>, 
  Jeff Breidenbach <jab@debian.org>, Michael Koch <konqueror@gmx.de>
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/lucene2/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/lucene2/
 Homepage: http://lucene.apache.org/java/
 Build-Depends: cdbs (>= 0.4.49), debhelper (>= 6), dpatch (>= 2.0),
- sun-java5-jre, sun-java5-jdk, 
+ openjdk-6-jdk, 
  ant-optional, javacc, junit
 Build-Depends-Indep: libjtidy-java (>= 7),
  libjline-java (>= 0.9.5), 
@@ -18,12 +19,13 @@
  libdb-je-java (>= 3.2.68),
  libcommons-collections3-java (>= 3.1), 
  libcommons-logging-java (>= 1.0.4), 
- libcommons-beanutils-java (>= 1.7.0)
+ libcommons-beanutils-java (>= 1.7.0),
+ w3c-dtd-xhtml (>= 1.1-5ubuntu1)
 Standards-Version: 3.7.3
 
 Package: liblucene2-java
 Architecture: all
-Depends: sun-java5-jre | sun-java6-jre,
+Depends: openjdk-6-jre | java2-runtime,
  libjtidy-java (>= 7),
  libjline-java (>= 0.9.5), 
  libcommons-digester-java (>= 1.7), 
diff -u lucene2-2.3.1+ds1/debian/changelog lucene2-2.3.1+ds1/debian/changelog
--- lucene2-2.3.1+ds1/debian/changelog
+++ lucene2-2.3.1+ds1/debian/changelog
@@ -1,3 +1,23 @@
+lucene2 (2.3.1+ds1-1ubuntu1) intrepid; urgency=low
+
+  * Merge from debian unstable. (LP: #227038)
+  * Remaining Ubuntu changes:
+    - debian/control
+       * Use openjdk-6-jdk as build dependency and openjdk-6-jre package as
+         runtime dependency.
+       * Add w3c-dtd-xhtml as build dependency to fix FTBFS.
+       * Modify Maintainer value to match the DebianMaintainerField
+         specification.
+    - debian/patches
+      * 82_fix_xhtml_dtd_access.dpatch - Patch for fixing contrib unit tests.
+      Fixes FTBFS on buildd.
+      * 00list - Updated to include above patch and remove Debian's patch
+        81_prevent-network-access.dpatch
+    - debian/rules
+      * Set JAVA_HOME corresponding to openjdk.
+
+ -- Onkar Shinde <onkarshinde@gmail.com>  Tue, 06 May 2008 01:21:49 +0530
+
 lucene2 (2.3.1+ds1-1) unstable; urgency=low
 
   [ Michael Koch ]
@@ -39,6 +59,32 @@
 
  -- Jan-Pascal van Best <janpascal@vanbest.org>  Fri, 01 Feb 2008 14:18:11 +0100
 
+lucene2 (2.2.0-2ubuntu2) hardy; urgency=low
+
+  * Build and Depend on openjdk-6 instead of icedtea (LP: #203636)
+    - debian/rules: s/icedtea-java7/openjdk-6/g
+    - debian/control: adjust JAVA_HOME
+
+ -- Daniel Hahler <ubuntu@thequod.de>  Wed, 19 Mar 2008 00:50:09 +0100
+
+lucene2 (2.2.0-2ubuntu1) hardy; urgency=low
+
+  * debian/control
+    - Add w3c-dtd-xhtml as build dependency. Needed to fix build failure.
+    - Use icedtea-java7-jdk build dependency. (LP: #185917)
+    - Modify Maintainer value to match the DebianMaintainerField
+      specification.
+    - Add 'Homepage' field and remove links from description.
+    - Update standards version to 3.7.3. 
+  * debian/patches
+    - 82_fix_xhtml_dtd_access.dpatch - Patch for fixing contrib unit tests.
+      Fixes FTBFS on buildd. (LP: #189602)
+    - 00list - Updated to include above patch
+  * debian/rules
+    - Set JAVA_HOME corresponding to icedtea.
+
+ -- Onkar Shinde <onkarshinde@gmail.com>  Tue, 15 Jan 2008 19:09:15 +0530
+
 lucene2 (2.2.0-2) unstable; urgency=low
 
   * Use libdb4.5-java instead of libdb4.3-java, which is removed from Debian.
@@ -64,0 +111 @@
+
diff -u lucene2-2.3.1+ds1/debian/patches/00list lucene2-2.3.1+ds1/debian/patches/00list
--- lucene2-2.3.1+ds1/debian/patches/00list
+++ lucene2-2.3.1+ds1/debian/patches/00list
@@ -11 +11 @@
-81_prevent-network-access.dpatch
+82_fix_xhtml_dtd_access.dpatch
only in patch2:
unchanged: