diff -Nru excalibur-logkit-2.0/debian/changelog excalibur-logkit-2.0/debian/changelog
--- excalibur-logkit-2.0/debian/changelog	2010-06-08 17:35:58.000000000 +0200
+++ excalibur-logkit-2.0/debian/changelog	2010-07-16 18:53:40.000000000 +0200
@@ -1,3 +1,16 @@
+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: