[libcommons-cli-java] 04/31: Imported Debian patch 1.0-7

[Tony Mancill]

This is an automated email from the git hooks/post-receive script.

tmancill pushed a commit to branch master
in repository libcommons-cli-java.

commit 28005132b7cf056baa34a6eac4a11794eede8d60
Author: Arnaud Vandyck <avdyk at debian.org>
Date:   Sat Aug 20 19:44:58 2005 +0200

    Imported Debian patch 1.0-7
---
 debian/changelog | 6 ++++++
 debian/control   | 2 +-
 debian/rules     | 4 ++--
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2dd6f09..99197df 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libcommons-cli-java (1.0-7) unstable; urgency=low
+
+  * libant1.6-java to ant transition
+
+ -- Arnaud Vandyck <avdyk at debian.org>  Sat, 20 Aug 2005 19:44:58 +0200
+
 libcommons-cli-java (1.0-6) unstable; urgency=low
 
   * corrected the epoch version of kaffe dependency (closes: #302011)
diff --git a/debian/control b/debian/control
index 2804abe..f30b7f9 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: libs
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Ola Lundqvist <opal at debian.org>, Takashi Okamoto <tora at debian.org>, Stefan Gybas <sgybas at debian.org>, Arnaud Vandyck <avdyk at debian.org>
-Build-Depends-Indep: debhelper (>= 4.1), cdbs (>= 0.4.8), kaffe (>= 2:1.1.4), libant1.6-java, libcommons-logging-java, libcommons-lang-java, junit, jikes
+Build-Depends-Indep: debhelper (>= 4.1), cdbs (>= 0.4.8), kaffe (>= 2:1.1.4), ant, libcommons-logging-java, libcommons-lang-java, junit, jikes
 Standards-Version: 3.6.1
 
 Package: libcommons-cli-java
diff --git a/debian/rules b/debian/rules
index bd91e5e..5ba6619 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,8 +12,8 @@ include /usr/share/cdbs/1/class/ant.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
 JAVA_HOME_DIRS       := /usr/lib/kaffe
-ANT_HOME             := /usr/share/ant1.6
-DEB_JARS             := junit commons-lang commons-loging /usr/share/ant1.6/lib/ant-launcher.jar
+ANT_HOME             := /usr/share/ant
+DEB_JARS             := junit commons-lang commons-loging $(ANT_HOME)/lib/ant-launcher.jar
 DEB_ANT_COMPILER     := jikes
 DEB_ANT_BUILD_TARGET := jar
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libcommons-cli-java.git