[gant] 03/04: Depend on groovy instead of groovy2

[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 ad6f221dde41ef04d2cbd664cca1488b700df1fb
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue May 3 10:06:46 2016 +0200

    Depend on groovy instead of groovy2
---
 debian/changelog | 1 +
 debian/control   | 2 +-
 debian/rules     | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3f9667b..21e6436 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 gant (1.9.11-3) UNRELEASED; urgency=medium
 
   * Team upload.
+  * Depend on groovy instead of groovy2
   * Standards-Version updated to 3.9.8 (no changes)
   * Use secure Vcs-* URLs
 
diff --git a/debian/control b/debian/control
index 9e4d9d3..e118f74 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Homepage: http://gant.github.io
 
 Package: gant
 Architecture: all
-Depends: ant, groovy2, ${misc:Depends}
+Depends: ant, groovy, ${misc:Depends}
 Recommends: libmaven-ant-tasks-java, maven
 Description: Groovy build framework based on scripting Ant tasks
  Gant is a build tool for scripting Ant tasks using Groovy instead of
diff --git a/debian/rules b/debian/rules
index 5628a7f..c45c3fd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,7 @@
 
 export JAVA_HOME = /usr/lib/jvm/default-java
 
-GROOVY_HOME      = /usr/share/groovy2
+GROOVY_HOME      = /usr/share/groovy
 UPSTREAM_VERSION = $(shell dpkg-parsechangelog | sed -rne 's/^Version: ([0-9.]+)[-+].*$$/\1/p')
 
 %:

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