CVS libjdom-java/debian

[Arnaud Vandyck]

Update of /cvsroot/pkg-java/libjdom-java/debian
In directory haydn:/tmp/cvs-serv27325/debian

Modified Files:
	changelog control rules 
Log Message:
libjdom-java (0.99.b10-4) unstable; urgency=low

  * debian/control, debian/rules: ant transition

 -- Arnaud Vandyck <avdyk at debian.org>  Thu, 22 Sep 2005 23:45:42 +0200



--- /cvsroot/pkg-java/libjdom-java/debian/changelog	2005/03/22 22:33:35	1.2
+++ /cvsroot/pkg-java/libjdom-java/debian/changelog	2005/09/22 21:48:29	1.3
@@ -1,3 +1,9 @@
+libjdom-java (0.99.b10-4) unstable; urgency=low
+
+  * debian/control, debian/rules: ant transition
+
+ -- Arnaud Vandyck <avdyk at debian.org>  Thu, 22 Sep 2005 23:45:42 +0200
+
 libjdom-java (0.99.b10-3) unstable; urgency=low
 
   * Removed alternative libant1.5-java build dependency
--- /cvsroot/pkg-java/libjdom-java/debian/control	2005/03/22 22:33:37	1.2
+++ /cvsroot/pkg-java/libjdom-java/debian/control	2005/09/22 21:48:29	1.3
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Takashi Okamoto <tora at debian.org>, Arnaud Vandyk <avdyk at debian.org>, Wolfgang Baer <WBaer at gmx.de>
-Build-Depends-Indep: debhelper (>> 3.0.0), cdbs, jikes (>= 1.15), kaffe(>= 1.0.6), libant1.6-java
+Build-Depends-Indep: debhelper (>> 3.0.0), cdbs, jikes (>= 1.15), kaffe(>= 1.0.6), ant
 Standards-Version: 3.6.1
 
 Package: libjdom-java
--- /cvsroot/pkg-java/libjdom-java/debian/rules	2004/10/11 09:50:51	1.1.1.1
+++ /cvsroot/pkg-java/libjdom-java/debian/rules	2005/09/22 21:48:29	1.2
@@ -15,11 +15,11 @@
 
 # Directories to look for JAVA_HOME (JDK 1.4+ required!)
 JAVA_HOME_DIRS := /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 
+DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar 
 
 # Build compiler
 DEB_ANT_COMPILER := jikes