diff -Nur libcommons-collections-java-2.1.1/debian/changelog libcommons-collections-java-2.1.1.fixed/debian/changelog --- libcommons-collections-java-2.1.1/debian/changelog 2005-05-13 11:22:01.104217401 -0700 +++ libcommons-collections-java-2.1.1.fixed/debian/changelog 2005-05-03 12:41:34.000000000 -0700 @@ -1,3 +1,11 @@ +libcommons-collections-java (2.1.1-3.1) unstable; urgency=low + + * Depend on java1-runtime so sablevm can satisfy + * Run tests + * Build javadocs + + -- Jack Bates Tue, 3 May 2005 12:22:45 -0700 + libcommons-collections-java (2.1.1-3) unstable; urgency=low * rebuild by jikes with -source 1.3 option. This keeps backward diff -Nur libcommons-collections-java-2.1.1/debian/control libcommons-collections-java-2.1.1.fixed/debian/control --- libcommons-collections-java-2.1.1/debian/control 2005-05-13 11:22:01.102217249 -0700 +++ libcommons-collections-java-2.1.1.fixed/debian/control 2005-05-13 11:21:36.573354096 -0700 @@ -3,21 +3,21 @@ Priority: optional Maintainer: Debian Java Maintainers Uploaders: Takashi Okamoto -Build-Depends-Indep: debhelper (>> 4.0.0), libant1.6-java, kaffe (>= 1:1.1.3), jikes (>= 1:1.18-8), cdbs (>= 0.4.21-0.1) +Build-Depends-Indep: debhelper (>> 4.0.0), kaffe (>= 1:1.1.3), jikes (>= 1:1.18-8), cdbs (>= 0.4.21-0.1), libant1.6-java, gjdoc, junit Standards-Version: 3.5.8 Package: libcommons-collections-java Architecture: all -Depends: kaffe (>= 1:1.1.3) | java2-runtime +Depends: kaffe (>= 1:1.1.3) | java2-runtime | java1-runtime Suggests: libcommons-collections-java-doc -Description: A set of abstract data type interfaces and implementations +Description: set of abstract data type interfaces and implementations The Java Collections Framework provides a set of abstract data type interfaces and implementations that offer both a wealth of useful functionality, and a solid foundation for extending that functionality. -#Package: libcommons-collections-java-doc -#Architecture: all -#Description: Documentation for libcommons-collections-java -# Documentation for libcommons-collections-java which is a set of abstract -# data type interfaces and implementations. +Package: libcommons-collections-java-doc +Architecture: all +Description: documentation for libcommons-collections-java + Documentation for libcommons-collections-java which is a set of abstract + data type interfaces and implementations. diff -Nur libcommons-collections-java-2.1.1/debian/libcommons-collections-java-doc.docs libcommons-collections-java-2.1.1.fixed/debian/libcommons-collections-java-doc.docs --- libcommons-collections-java-2.1.1/debian/libcommons-collections-java-doc.docs 2005-05-13 11:22:01.103217325 -0700 +++ libcommons-collections-java-2.1.1.fixed/debian/libcommons-collections-java-doc.docs 2005-05-03 11:31:59.000000000 -0700 @@ -1,2 +1 @@ dist/docs/api -STATUS.html diff -Nur libcommons-collections-java-2.1.1/debian/rules libcommons-collections-java-2.1.1.fixed/debian/rules --- libcommons-collections-java-2.1.1/debian/rules 2005-05-13 11:22:01.103217325 -0700 +++ libcommons-collections-java-2.1.1.fixed/debian/rules 2005-05-07 09:38:56.000000000 -0700 @@ -6,12 +6,11 @@ # 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 -DEB_JARS := /usr/share/ant1.6/lib/ant-launcher.jar log4j-1.2 logkit servlet-2.3 - +DEB_JARS := /usr/share/ant1.6/lib/ant-launcher.jar log4j-1.2 logkit servlet-2.3 junit # Build compiler DEB_ANT_COMPILER := jikes @@ -22,8 +21,10 @@ # Defaults to build.xml (Ant default) in $(DEB_BUILDDIR) #DEB_ANT_BUILDFILE := build.xml -DEB_ANT_BUILD_TARGET := dist-jar +DEB_ANT_BUILD_TARGET := dist-jar doc + +# Disabled pending http://issues.apache.org/bugzilla/show_bug.cgi?id=34690 +#DEB_ANT_TEST_TARGET := test install/libcommons-collections-java:: install -m 644 dist/commons-collections-2.1.1.jar debian/libcommons-collections-java/usr/share/java/commons-collections-2.1.1.jar -