[gmetrics] 01/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 gmetrics.

commit e35556a8fefd43767f96a462c3ba906e7065f5d1
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue May 10 22:26:43 2016 +0200

    Depend on groovy instead of groovy2
---
 debian/changelog        | 7 +++++++
 debian/classpath-debian | 2 +-
 debian/control          | 4 ++--
 debian/maven.rules      | 1 -
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7cac99c..7b8fb0a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+gmetrics (0.7-4) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Depend on groovy instead of groovy2
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Tue, 10 May 2016 22:25:03 +0200
+
 gmetrics (0.7-3) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/classpath-debian b/debian/classpath-debian
index e20d7e4..1a71aff 100644
--- a/debian/classpath-debian
+++ b/debian/classpath-debian
@@ -1,2 +1,2 @@
-usr/share/java/groovy-all-2.x.jar
+usr/share/java/groovy-all.jar
 usr/share/java/log4j-1.2.jar
diff --git a/debian/control b/debian/control
index a09b570..cf6a04b 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends: ant,
                debhelper (>= 9),
                default-jdk,
                default-jdk-doc,
-               groovy2,
+               groovy,
                javahelper,
                liblog4j1.2-java,
                maven-repo-helper
@@ -18,7 +18,7 @@ Homepage: http://gmetrics.sourceforge.net/
 
 Package: libgmetrics-groovy-java
 Architecture: all
-Depends: ant, groovy2, liblog4j1.2-java, ${misc:Depends}
+Depends: ant, groovy, liblog4j1.2-java, ${misc:Depends}
 Suggests: libgmetrics-groovy-java-doc
 Description: Groovy library that provides reports and metrics for Groovy code
  GMetrics provides calculation and reporting of size and
diff --git a/debian/maven.rules b/debian/maven.rules
index c6ee791..e92dcc8 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -1,4 +1,3 @@
 junit junit jar s/3\..*/3.x/ * *
 log4j log4j jar s/1\.2\..*/1.2.x/ * *
 s/ant/org.apache.ant/ * * s/.*/debian/ * *
-org.codehaus.groovy groovy* * s/.*/2.x/ * *

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