[gmetrics] 02/04: Transition to Groovy 2

[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 49e3545658f30d4b055be7e0861847b197a3d454
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Nov 20 11:05:54 2015 +0100

    Transition to Groovy 2
---
 debian/changelog        | 4 +++-
 debian/classpath-debian | 2 +-
 debian/control          | 2 +-
 debian/maven.rules      | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 86635b3..cf5a172 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
-gmetrics (0.5-2) UNRELEASED; urgency=medium
+gmetrics (0.7-2) UNRELEASED; urgency=medium
 
   * Team upload.
+  * New upstream release
+    - Transition to Groovy 2
   * debian/control:
     - Removed the deprecated DM-Upload-Allowed field
     - Standards-Version updated to 3.9.6 (no changes)
diff --git a/debian/classpath-debian b/debian/classpath-debian
index 1a71aff..e20d7e4 100644
--- a/debian/classpath-debian
+++ b/debian/classpath-debian
@@ -1,2 +1,2 @@
-usr/share/java/groovy-all.jar
+usr/share/java/groovy-all-2.x.jar
 usr/share/java/log4j-1.2.jar
diff --git a/debian/control b/debian/control
index 0354783..a697cf1 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.or
 Uploaders: Miguel Landaeta <miguel at miguel.cc>
 Section: java
 Priority: optional
-Build-Depends: debhelper (>= 9), groovy, ant, javahelper,
+Build-Depends: debhelper (>= 9), groovy2, ant, javahelper,
  maven-repo-helper, liblog4j1.2-java, default-jdk-doc, default-jdk
 Standards-Version: 3.9.6
 Vcs-Git: git://anonscm.debian.org/pkg-java/gmetrics.git
diff --git a/debian/maven.rules b/debian/maven.rules
index fa91c9c..c6ee791 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -1,4 +1,4 @@
 junit junit jar s/3\..*/3.x/ * *
 log4j log4j jar s/1\.2\..*/1.2.x/ * *
 s/ant/org.apache.ant/ * * s/.*/debian/ * *
-s/groovy/org.codehaus.groovy/ groovy* * 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