diff -Nru excalibur-logkit-2.0/debian/changelog excalibur-logkit-2.0/debian/changelog
--- excalibur-logkit-2.0/debian/changelog	2010-06-14 21:03:26.000000000 +0200
+++ excalibur-logkit-2.0/debian/changelog	2010-07-16 18:53:40.000000000 +0200
@@ -1,9 +1,24 @@
+excalibur-logkit (2.0-4ubuntu1) maverick; urgency=low
+
+  * Merge from debian unstable (LP: #606368). Remaining changes:
+    - Change build-dep libjboss-j2ee-java to libgeronimo-jms-1.1-spec-java
+
+ -- Angel Abad <angelabad@gmail.com>  Tue, 15 Jun 2010 01:33:29 +0100
+
 excalibur-logkit (2.0-4) unstable; urgency=low
 
   * Servlet 2.5 transition: Also runtime-depend on libservlet2.5-java
 
  -- Thierry Carrez <thierry.carrez@ubuntu.com>  Tue, 08 Jun 2010 17:39:05 +0200
 
+excalibur-logkit (2.0-3ubuntu1) maverick; urgency=low
+
+  * Merge from debian unstable. Remaining changes:
+    - Change build-dep libjboss-j2ee-java to libgeronimo-jms-1.1-spec-java
+    - Also runtime-depend on libservlet2.5-java
+
+ -- Thierry Carrez <thierry.carrez@ubuntu.com>  Tue, 08 Jun 2010 17:35:15 +0200
+
 excalibur-logkit (2.0-3) unstable; urgency=low
 
   * Team upload.
@@ -13,6 +28,20 @@
 
  -- Torsten Werner <twerner@debian.org>  Mon, 03 May 2010 20:23:36 +0200
 
+excalibur-logkit (2.0-2ubuntu2) lucid; urgency=low
+
+  * debian/control, debian/rules: (Build-)Depend on libservlet2.5-java instead
+    of libservlet2.4-java (LP: #534913)
+
+ -- Thierry Carrez <thierry.carrez@ubuntu.com>  Tue, 09 Mar 2010 09:41:45 +0100
+
+excalibur-logkit (2.0-2ubuntu1) lucid; urgency=low
+
+  * Change build-dep libjboss-j2ee-java to libgeronimo-jms-1.1-spec-java.
+    (LP: #484458)
+
+ -- Onkar Shinde <onkarshinde@ubuntu.com>  Thu, 19 Nov 2009 23:19:13 +0530
+
 excalibur-logkit (2.0-2) unstable; urgency=low
 
   * Remove libgeronimo-jms-1.1-spec-java from build dependencies.
@@ -62,3 +91,4 @@
       * Fix two problems in build.xml.
 
  -- Onkar Shinde <onkarshinde@ubuntu.com>  Fri, 10 Jul 2009 02:31:21 +0530
+
diff -Nru excalibur-logkit-2.0/debian/control excalibur-logkit-2.0/debian/control
--- excalibur-logkit-2.0/debian/control	2010-06-08 17:40:58.000000000 +0200
+++ excalibur-logkit-2.0/debian/control	2010-06-15 02:33:29.000000000 +0200
@@ -1,10 +1,11 @@
 Source: excalibur-logkit
 Section: java
 Priority: optional
-Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
 Uploaders: Onkar Shinde <onkarshinde@ubuntu.com>
 Build-Depends: debhelper (>=5), cdbs, ant
-Build-Depends-Indep: default-jdk, ant-optional, junit, libjboss-j2ee-java, libgnumail-java, liblog4j1.2-java, libservlet2.5-java
+Build-Depends-Indep: default-jdk, ant-optional, junit, libgeronimo-jms-1.1-spec-java, libgnumail-java, liblog4j1.2-java, libservlet2.5-java
 Standards-Version: 3.8.4
 Vcs-Svn: svn://svn.debian.org/pkg-java/trunk/excalibur-logkit/
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-java/trunk/excalibur-logkit/