reverted:
--- commons-pool-1.3/build.properties
+++ commons-pool-1.3.orig/build.properties
@@ -1 +0,0 @@
-junit.jar=/usr/share/java/junit.jar
reverted:
--- commons-pool-1.3/build.xml
+++ commons-pool-1.3.orig/build.xml
@@ -93,7 +93,7 @@
                nonavbar="false"
                serialwarn="false"
                source="1.3">
+          <link href="http://java.sun.com/j2se/1.3/docs/api"/>
-          <link href="/usr/share/doc/classpath-doc/api"/>
       </javadoc>
    </target>
 
@@ -130,16 +130,14 @@
 
    <target name="test" depends="compile-test" description="runs (junit) unit tests">
       <echo message="Because we need to sleep to test the eviction threads, this takes a little while (around 35 seconds)..."/>
+      <java classname="${test.runner}" fork="yes" failonerror="${test.failonerror}">
+        <arg value="${test.entry}"/> 
-      <junit haltonerror="${test.failonerror}"
-             haltonfailure="${test.failonerror}"
-             printsummary="on">
-        <test name="${test.entry}"/> 
         <classpath>
           <pathelement location="${build.classes.dir}" /> 
           <pathelement location="${build.test-classes.dir}" /> 
           <pathelement path="${classpath}" /> 
         </classpath>
+      </java>
-      </junit>
    </target>
 
    <target name="build-jar" depends="compile">
diff -u commons-pool-1.3/debian/changelog commons-pool-1.4/debian/changelog
--- commons-pool-1.3/debian/changelog
+++ commons-pool-1.4/debian/changelog
@@ -1,3 +1,11 @@
+commons-pool (1.4-0ubuntu1) jaunty; urgency=low
+
+  * New upstream release (LP: #325357)
+  * Reenable junit tests.
+  * Dropped javadoc patch (no javadoc package built).
+
+ -- Thierry Carrez <thierry.carrez@ubuntu.com>  Tue, 10 Feb 2009 14:45:23 +0000
+
 commons-pool (1.3-1ubuntu2) intrepid; urgency=low
 
   * Drop unnecessary classpath-doc build dependency, classpath is in universe.
diff -u commons-pool-1.3/debian/rules commons-pool-1.4/debian/rules
--- commons-pool-1.3/debian/rules
+++ commons-pool-1.4/debian/rules
@@ -49,6 +49,7 @@
 	dh_testroot
 	dh_installchangelogs
 	dh_installdocs
+	mv dist/$(BASENAME).jar dist/$(BASENAME)-$(VERSION).jar
 	install -m 644 dist/$(BASENAME)-$(VERSION).jar $(JAVALIBDIR)
 	ln -s $(BASENAME)-$(VERSION).jar $(JAVALIBDIR)/$(BASENAME).jar
 	dh_compress