r2310 - trunk/libcommons-collections3-java/debian

[Arnaud Vandyck]

Author: avdyk
Date: 2006-08-01 14:23:55 +0000 (Tue, 01 Aug 2006)
New Revision: 2310

Modified:
   trunk/libcommons-collections3-java/debian/changelog
   trunk/libcommons-collections3-java/debian/control
   trunk/libcommons-collections3-java/debian/rules
Log:
libcommons-collections3-java (3.1a-3) unstable; urgency=low

  * Added myself as an uploader
  * Build with java-gcj-compat-dev
  * Updated Standards-Version; put debhelper and cdbs in Build-Depends
  * Added tf.jar to the build (closes: #268223).

 -- Arnaud Vandyck <avdyk at debian.org>  Tue,  1 Aug 2006 16:18:53 +0200

Modified: trunk/libcommons-collections3-java/debian/changelog
===================================================================
--- trunk/libcommons-collections3-java/debian/changelog	2006-08-01 14:00:34 UTC (rev 2309)
+++ trunk/libcommons-collections3-java/debian/changelog	2006-08-01 14:23:55 UTC (rev 2310)
@@ -1,3 +1,12 @@
+libcommons-collections3-java (3.1a-3) unstable; urgency=low
+
+  * Added myself as an uploader
+  * Build with java-gcj-compat-dev
+  * Updated Standards-Version; put debhelper and cdbs in Build-Depends
+  * Added tf.jar to the build (closes: #268223).
+
+ -- Arnaud Vandyck <avdyk at debian.org>  Tue,  1 Aug 2006 16:18:53 +0200
+
 libcommons-collections3-java (3.1a-2) unstable; urgency=low
 
   * Removed explicit usage of jikes build compiler property

Modified: trunk/libcommons-collections3-java/debian/control
===================================================================
--- trunk/libcommons-collections3-java/debian/control	2006-08-01 14:00:34 UTC (rev 2309)
+++ trunk/libcommons-collections3-java/debian/control	2006-08-01 14:23:55 UTC (rev 2310)
@@ -2,14 +2,15 @@
 Section: libs
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Wolfgang Baer <WBaer at gmx.de>
-Build-Depends-Indep: debhelper (>= 4.2.30), ant, ant-optional, kaffe (>= 2:1.1.5-3), cdbs (>=0.4.21)
-Standards-Version: 3.6.2
+Uploaders: Wolfgang Baer <WBaer at gmx.de>, Arnaud Vandyck <avdyk at debian.org>
+Build-Depends-Indep: debhelper (>= 4.2.30), cdbs (>=0.4.21)
+Build-Depends-Indep: ant, ant-optional, java-gcj-compat-dev
+Standards-Version: 3.7.2
 
 Package: libcommons-collections3-java
 Architecture: all
 Section: libs
-Depends: kaffe (>= 2:1.1.5-3) | java1-runtime | java2-runtime
+Depends: kaffe (>= 2:1.1.5-3) | java-gcj-compat | java1-runtime | java2-runtime
 Suggests: libcommons-collections3-java-doc
 Description: A set of abstract data type interfaces and implementations
  The Java Collections Framework provides a set of abstract data

Modified: trunk/libcommons-collections3-java/debian/rules
===================================================================
--- trunk/libcommons-collections3-java/debian/rules	2006-08-01 14:00:34 UTC (rev 2309)
+++ trunk/libcommons-collections3-java/debian/rules	2006-08-01 14:23:55 UTC (rev 2310)
@@ -8,14 +8,14 @@
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/class/ant.mk
 
-JAVA_HOME := /usr/lib/kaffe
-ANT_HOME := /usr/share/ant
+JAVA_HOME := /usr/lib/jvm/java-gcj
 
-DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar $(ANT_HOME)/lib/ant-junit.jar junit
-DEB_ANT_BUILD_TARGET := jar javadoc
+DEB_JARS := $(ANT_HOME)/lib/ant-junit.jar junit
+DEB_ANT_BUILD_TARGET := jar tf.jar javadoc
 
 install/libcommons-collections3-java::
 	install -m 644 $(DEB_SRCDIR)/build/commons-collections-3.1.jar debian/libcommons-collections3-java/usr/share/java/commons-collections3-3.1.jar
+	install -m 644 $(DEB_SRCDIR)/build/commons-collections-testframework-3.1.jar debian/libcommons-collections3-java/usr/share/java/commons-collections3-testframework-3.1.jar
 
 clean::
 	rm -f debian/files