[gant] 46/51: Removed debian/ant.properties

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository gant.

commit fe975ed3d95454f63afa5e4c7543a62585d6f22d
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Jul 31 13:41:35 2015 +0200

    Removed debian/ant.properties
---
 debian/ant.properties | 1 -
 debian/rules          | 4 +++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/ant.properties b/debian/ant.properties
deleted file mode 100644
index ecf71ed..0000000
--- a/debian/ant.properties
+++ /dev/null
@@ -1 +0,0 @@
-environment.GROOVY_HOME=/usr/share/groovy2/
diff --git a/debian/rules b/debian/rules
index 06bb0b5..62cc8bd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,10 +4,12 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/ant.mk
 
 JAVA_HOME            := /usr/lib/jvm/default-java
+GROOVY_HOME          := /usr/share/groovy2
+
 DEB_ANT_BUILDFILE    := debian/build.xml
 DEB_ANT_BUILD_TARGET := package
+DEB_ANT_ARGS         := -Denvironment.GROOVY_HOME=$(GROOVY_HOME)
 UPSTREAM_VERSION     := $(shell echo $(DEB_UPSTREAM_VERSION) | sed -e's,+dak.*,,')
-GROOVY_HOME=/usr/share/groovy2
 
 DEB_INSTALL_CHANGELOGS_ALL = releaseNotes.txt
 

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