CVS commons-collections/debian

[Wolfgang B??r]

Update of /cvsroot/pkg-java/commons-collections/debian
In directory haydn:/tmp/cvs-serv10809/debian

Modified Files:
	changelog control docs rules 
Added Files:
	doc-base 
Removed Files:
	libcommons-collections-java-doc.docs 
	libcommons-collections-java.links 
Log Message:
libcommons-collections-java (2.1.1-4) unstable; urgency=low

  * libant1.6-java to ant transition
  * Added java1-runtime as alternative to java2-runtime
  * Build documentation and registered with doc-base
  * Added myself as uploader
  * Standards-Version 3.6.2 (no changes


--- /cvsroot/pkg-java/commons-collections/debian/changelog	2005/08/17 04:48:06	1.3
+++ /cvsroot/pkg-java/commons-collections/debian/changelog	2005/09/24 23:47:52	1.4
@@ -1,3 +1,13 @@
+libcommons-collections-java (2.1.1-4) unstable; urgency=low
+
+  * libant1.6-java to ant transition
+  * Added java1-runtime as alternative to java2-runtime
+  * Build documentation and registered with doc-base
+  * Added myself as uploader
+  * Standards-Version 3.6.2 (no changes)
+ 
+ -- Wolfgang Baer <WBaer at gmx.de>  Sat, 24 Sep 2005 23:16:55 +0200
+
 libcommons-collections-java (2.1.1-3) unstable; urgency=low
 
   * rebuild by jikes with -source 1.3 option. This keeps backward 
--- /cvsroot/pkg-java/commons-collections/debian/control	2005/08/17 04:48:06	1.3
+++ /cvsroot/pkg-java/commons-collections/debian/control	2005/09/24 23:47:52	1.4
@@ -2,22 +2,16 @@
 Section: libs
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Takashi Okamoto <tora at debian.org>
-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)
-Standards-Version: 3.6.1
+Uploaders: Takashi Okamoto <tora at debian.org>, Wolfgang Baer <WBaer at gmx.de>
+Build-Depends-Indep: debhelper (>= 4.2.30), ant, kaffe (>= 2:1.1.5-3), cdbs
+Standards-Version: 3.6.2
 
 Package: libcommons-collections-java
 Architecture: all
-Depends: kaffe (>= 1:1.1.3) | java2-runtime
+Depends: kaffe (>= 2:1.1.5-3) | java1-runtime | java2-runtime
 Suggests: libcommons-collections-java-doc
 Description: A 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.
--- /cvsroot/pkg-java/commons-collections/debian/docs	2002/10/20 02:57:40	1.1.1.1
+++ /cvsroot/pkg-java/commons-collections/debian/docs	2005/09/24 23:47:52	1.2
@@ -1 +1,3 @@
+dist/docs/api
 STATUS.html
+RELEASE-NOTES-2.1.1.html
--- /cvsroot/pkg-java/commons-collections/debian/rules	2005/08/17 04:48:06	1.3
+++ /cvsroot/pkg-java/commons-collections/debian/rules	2005/09/24 23:47:52	1.4
@@ -4,25 +4,12 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/ant.mk
 
-# These two must be specified
 JAVA_HOME := /usr/lib/kaffe
-ANT_HOME := /usr/share/ant1.6
+ANT_HOME := /usr/share/ant
 
-# 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
-
-
-# Build compiler
+DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar log4j-1.2 logkit servlet-2.3
 DEB_ANT_COMPILER := jikes
-
-# Defaults to debian/ant.properties
-#DEB_ANT_PROPERTYFILE := build.properties
-
-# 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
 
 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