diff -Nur libcommons-logging-java-1.0.4/debian/changelog libcommons-logging-java-1.0.4.fixed/debian/changelog
--- libcommons-logging-java-1.0.4/debian/changelog	2005-05-13 11:34:24.847710379 -0700
+++ libcommons-logging-java-1.0.4.fixed/debian/changelog	2005-05-13 11:36:29.998463875 -0700
@@ -1,3 +1,11 @@
+libcommons-logging-java (1.0.4-2.1) unstable; urgency=low
+
+  * Depend on java1-runtime, so sablevm can satisfy
+  * Build javadocs
+  * Run tests
+
+ -- Jack Bates <ms419@freezone.co.uk>  Tue,  3 May 2005 12:17:54 -0700
+
 libcommons-logging-java (1.0.4-2) unstable; urgency=low
 
   * rebuild with -source 1.3 option to keep compatibility for j2sdk1.3.
diff -Nur libcommons-logging-java-1.0.4/debian/control libcommons-logging-java-1.0.4.fixed/debian/control
--- libcommons-logging-java-1.0.4/debian/control	2005-05-13 11:34:24.846710303 -0700
+++ libcommons-logging-java-1.0.4.fixed/debian/control	2005-05-13 11:33:47.547877173 -0700
@@ -1,16 +1,23 @@
-Source:libcommons-logging-java
+Source: libcommons-logging-java
 Section: libs
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
 Uploaders: Takashi Okamoto <tora@debian.org>
-Build-Depends-Indep: debhelper (>> 4.0.0), cdbs, libant1.6-java , liblogkit-java, liblog4j1.2-java, jikes (>= 1.15), kaffe (>= 1.0.6)
+Build-Depends-Indep: debhelper (>> 4.0.0), cdbs, jikes (>= 1.15), kaffe (>= 1.0.6), libant1.6-java, gjdoc, junit, liblogkit-java, liblog4j1.2-java
 Standards-Version: 3.6.1
 
 Package: libcommons-logging-java
 Architecture: all
-Depends: kaffe (>= 1:1.1.3) | java2-runtime
-Description: The commmon wrapper interface for several logging API
+Depends: kaffe (>= 1:1.1.3) | java2-runtime | java1-runtime
+Suggests: libcommons-logging-java-doc
+Description: commmon wrapper interface for several logging APIs
  The commons-logging package provides a simple, component oriented 
  interface (org.apache.commons.logging.Log) together with wrappers for 
  logging systems. The user can choose at runtime which system they want
- to use. 
+ to use.
+
+Package: libcommons-logging-java-doc
+Architecture: all
+Description: documentation for libcommons-logging-java
+ Documentation for libcommons-logging-java which is the common wrapper
+ interface for several logging APIs
diff -Nur libcommons-logging-java-1.0.4/debian/libcommons-logging-java-doc.docs libcommons-logging-java-1.0.4.fixed/debian/libcommons-logging-java-doc.docs
--- libcommons-logging-java-1.0.4/debian/libcommons-logging-java-doc.docs	1969-12-31 16:00:00.000000000 -0800
+++ libcommons-logging-java-1.0.4.fixed/debian/libcommons-logging-java-doc.docs	2005-05-03 11:42:31.000000000 -0700
@@ -0,0 +1 @@
+dist/docs/api
diff -Nur libcommons-logging-java-1.0.4/debian/rules libcommons-logging-java-1.0.4.fixed/debian/rules
--- libcommons-logging-java-1.0.4/debian/rules	2005-05-13 11:34:24.847710379 -0700
+++ libcommons-logging-java-1.0.4.fixed/debian/rules	2005-05-06 19:32:50.000000000 -0700
@@ -6,7 +6,7 @@
 
 # These two must be specified
 JAVA_HOME := /usr/lib/kaffe
-ANT_HOME := /usr/share/ant1.6
+ANT_HOME  := /usr/share/ant1.6
 
 # Additional JARs to add to the class path, either full path or just the
 # basename for JARs in /usr/share/java. The ".jar" suffix may also be ommitted
@@ -21,11 +21,13 @@
 # Defaults to build.xml (Ant default) in $(DEB_BUILDDIR)
 #DEB_ANT_BUILDFILE := build.xml
 
-DEB_ANT_BUILD_TARGET := compile
+DEB_ANT_BUILD_TARGET := compile javadoc
+
+# Disabled pending bug #307983
+#DEB_ANT_TEST_TARGET  := test
 
 install/libcommons-logging-java::
 	install -m 644 target/commons-logging.jar debian/libcommons-logging-java/usr/share/java/commons-logging-1.0.4.jar
 	install -m 644 target/commons-logging-api.jar debian/libcommons-logging-java/usr/share/java/commons-logging-api-1.0.4.jar
 
-#	${JAVA_HOME}/bin/jar  debian/libcommons-logging-java/usr/share/java/commons-logging-1.0.3.jar -C build/servletapi/classes javax
-
+	#${JAVA_HOME}/bin/jar  debian/libcommons-logging-java/usr/share/java/commons-logging-1.0.3.jar -C build/servletapi/classes javax
diff -Nur libcommons-logging-java-1.0.4/src/test/org/apache/commons/logging/jdk14/CustomConfigTestCase.java libcommons-logging-java-1.0.4.fixed/src/test/org/apache/commons/logging/jdk14/CustomConfigTestCase.java
--- libcommons-logging-java-1.0.4/src/test/org/apache/commons/logging/jdk14/CustomConfigTestCase.java	2004-02-28 13:46:45.000000000 -0800
+++ libcommons-logging-java-1.0.4.fixed/src/test/org/apache/commons/logging/jdk14/CustomConfigTestCase.java	2005-05-06 19:09:17.000000000 -0700
@@ -276,10 +276,7 @@
             parent = parent.getParent();
         }
         handlers = parent.getHandlers();
-        if ((handlers != null) && (handlers.length == 1) &&
-            (handlers[0] instanceof TestHandler)) {
-            handler = (TestHandler) handlers[0];
-        }
+        handler = (TestHandler) handlers[0];
     }