diff -pruN 1.4-2/.cvsignore 1.4-2ubuntu1/.cvsignore
--- 1.4-2/.cvsignore	2009-10-21 14:25:28.000000000 +0100
+++ 1.4-2ubuntu1/.cvsignore	1970-01-01 01:00:00.000000000 +0100
@@ -1,18 +0,0 @@
-LICENSE.txt
-NOTICE.txt
-PROPOSAL.html
-STATUS.html
-build
-build-stamp
-build.xml
-commons-io-1.0.jar
-dist
-docs
-maven.xml
-patch-stamp
-project.properties
-project.xml
-src
-target
-test
-xdocs
diff -pruN 1.4-2/debian/.cvsignore 1.4-2ubuntu1/debian/.cvsignore
--- 1.4-2/debian/.cvsignore	2009-10-21 14:25:28.000000000 +0100
+++ 1.4-2ubuntu1/debian/.cvsignore	1970-01-01 01:00:00.000000000 +0100
@@ -1,5 +0,0 @@
-files
-libcommons-io-java
-libcommons-io-java-doc
-libcommons-io-java.links
-patched
diff -pruN 1.4-2/debian/changelog 1.4-2ubuntu1/debian/changelog
--- 1.4-2/debian/changelog	2009-10-21 14:25:28.000000000 +0100
+++ 1.4-2ubuntu1/debian/changelog	2009-10-21 14:25:29.000000000 +0100
@@ -1,3 +1,11 @@
+commons-io (1.4-2ubuntu1) karmic; urgency=low
+
+  * Merge with Debian; remaining changes:
+    - debian/control: Set libcommons-io-java runtime dependency on
+      "default-jre-headless | java2-runtime-headless" (LP: #387884)
+
+ -- Matthias Klose <doko@ubuntu.com>  Mon, 19 Oct 2009 13:33:40 +0200
+
 commons-io (1.4-2) unstable; urgency=low
 
   * Upload to unstable.
@@ -23,6 +31,14 @@ commons-io (1.4-1.1) experimental; urgen
 
  -- Ludovic Claude <ludovic.claude@laposte.net>  Thu, 02 Jul 2009 23:28:09 +0100
 
+commons-io (1.4-1ubuntu1) karmic; urgency=low
+
+  * debian/control: Set libcommons-io-java runtime dependency on
+    "default-jre-headless | java2-runtime-headless" (LP: #387884)
+  * debian/control, debian/rules: Build-depend on default-jdk
+
+ -- Thierry Carrez <thierry.carrez@ubuntu.com>  Tue, 16 Jun 2009 15:24:31 +0200
+
 commons-io (1.4-1) unstable; urgency=low
 
   * New upstream release
diff -pruN 1.4-2/debian/control 1.4-2ubuntu1/debian/control
--- 1.4-2/debian/control	2009-10-21 14:25:28.000000000 +0100
+++ 1.4-2ubuntu1/debian/control	2009-10-21 14:25:29.000000000 +0100
@@ -12,7 +12,7 @@ Vcs-Browser: http://svn.debian.org/wsvn/
 
 Package: libcommons-io-java
 Architecture: all
-Depends: ${misc:Depends}
+Depends: ${misc:Depends}, default-jre-headless | java2-runtime-headless
 Suggests: libcommons-io-java-doc
 Description: Common useful IO related classes
  Commons-IO contains utility classes, stream implementations, file filters and