diff -Nur commons-beanutils-1.6.1/debian/changelog commons-beanutils-1.6.1.fixed/debian/changelog
--- commons-beanutils-1.6.1/debian/changelog	2005-05-13 11:15:10.472134387 -0700
+++ commons-beanutils-1.6.1.fixed/debian/changelog	2005-05-03 12:28:52.000000000 -0700
@@ -1,3 +1,10 @@
+commons-beanutils (1.6.1-4.1) unstable; urgency=low
+
+  * Run tests
+  * Build javadocs
+
+ -- Jack Bates <ms419@freezone.co.uk>  Tue,  3 May 2005 12:28:31 -0700
+
 commons-beanutils (1.6.1-4) unstable; urgency=low
 
   * rebuild by jikes with -source 1.3 option. 
diff -Nur commons-beanutils-1.6.1/debian/control commons-beanutils-1.6.1.fixed/debian/control
--- commons-beanutils-1.6.1/debian/control	2005-05-13 11:15:10.471134521 -0700
+++ commons-beanutils-1.6.1.fixed/debian/control	2005-05-13 11:18:34.896816036 -0700
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
 Uploaders: Takashi Okamoto <tora@debian.org>
-Build-Depends-Indep: kaffe (>= 2:1.1.4.PRE1.1.5-7), jikes, debhelper (>> 4.0.0), cdbs, libant1.6-java, libcommons-collections-java, libcommons-logging-java
+Build-Depends-Indep: kaffe (>= 2:1.1.4.PRE1.1.5-7), jikes, debhelper (>> 4.0.0), cdbs, libant1.6-java, gjdoc, junit, libcommons-collections-java, libcommons-logging-java
 Standards-Version: 3.5.8
 
 Package: libcommons-beanutils-java
@@ -14,10 +14,10 @@
  The BeanUtils Component contains a set of Java classes that provide
  static utility methods useful in manipulating Java classes that conform
  to the JavaBeans Specification naming patterns for bean properties in a 
- dynamic fashion. 
+ dynamic fashion.
 
-#Package: libcommons-beanutils-java-doc
-#Architecture: all
-#Description: Documentation for libcommons-collections-java
-# Documentation for libcommons-collections-java which is utility for 
-# manipulating JavaBeans.
+Package: libcommons-beanutils-java-doc
+Architecture: all
+Description: documentation for libcommons-collections-java
+ Documentation for libcommons-collections-java which is utility for 
+ manipulating JavaBeans.
diff -Nur commons-beanutils-1.6.1/debian/rules commons-beanutils-1.6.1.fixed/debian/rules
--- commons-beanutils-1.6.1/debian/rules	2005-05-13 11:15:10.472134387 -0700
+++ commons-beanutils-1.6.1.fixed/debian/rules	2005-05-09 13:30:05.000000000 -0700
@@ -6,11 +6,12 @@
 
 # These two must be specified
 JAVA_HOME := /usr/lib/kaffe
-ANT_HOME := /usr/share/ant1.6
+ANT_HOME  := /usr/share/ant1.6
+DEB_ANT_ARGS := -Djunit.jar=/usr/share/java/junit.jar -Dcommons-logging.jar=/usr/share/java/commons-logging.jar
 
 # 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
-DEB_JARS := commons-logging commons-collections /usr/share/ant1.6/lib/ant-launcher.jar
+DEB_JARS := /usr/share/ant1.6/lib/ant-launcher.jar commons-collections commons-logging
 
 # Build compiler
 DEB_ANT_COMPILER := jikes
@@ -21,8 +22,10 @@
 # Defaults to build.xml (Ant default) in $(DEB_BUILDDIR)
 #DEB_ANT_BUILDFILE := build.xml
 
-DEB_ANT_BUILD_TARGET := jar
+DEB_ANT_BUILD_TARGET := jar javadoc
+
+# Disabled pending http://issues.apache.org/bugzilla/show_bug.cgi?id=34824
+#DEB_ANT_TEST_TARGET  := test
 
 install/libcommons-beanutils-java::
 	install -m 644 dist/commons-beanutils.jar debian/libcommons-beanutils-java/usr/share/java/commons-beanutils-1.6.1.jar
-