[spock] 09/14: Depend on groovy2 instead of groovy

[Emmanuel Bourg]

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

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

commit 66312cf7d221ab3a891574199ea10a348893b44a
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Oct 1 10:59:06 2015 +0200

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

diff --git a/debian/build.xml b/debian/build.xml
index f958d91..2a66d1f 100644
--- a/debian/build.xml
+++ b/debian/build.xml
@@ -21,7 +21,7 @@ http://pkgs.fedoraproject.org/cgit/spock.git/
       
    <path id="groovyc.classpath">
     <fileset dir="/usr/share/java" includes="commons-cli.jar"/>
-    <fileset dir="/usr/share/java" includes="groovy-all.jar"/>
+    <fileset dir="/usr/share/java" includes="groovy-all-2.x.jar"/>
     <fileset dir="/usr/share/java" includes="asm4-all.jar"/>
     <fileset dir="/usr/share/java" includes="antlr.jar"/>
    </path>
diff --git a/debian/changelog b/debian/changelog
index 15cda0b..a868720 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ spock (0.7-groovy-2.0-1) UNRELEASED; urgency=medium
   * Team upload.
   * New upstream release:
     - Refreshed the patch
+    - Depend on groovy2 instead of groovy
   * Removed the gradle wrapper from the upstream tarball
   * debian/control: Updated the Homepage field
   * Updated debian/watch
diff --git a/debian/control b/debian/control
index 1cc7e1b..55b1d14 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.or
 Uploaders: Damien Raude-Morvan <drazzib at debian.org>,
  Miguel Landaeta <miguel at miguel.cc>
 Build-Depends: ant, debhelper (>= 9), default-jdk
-Build-Depends-Indep: groovy,
+Build-Depends-Indep: groovy2,
                      junit4,
                      libaopalliance-java,
                      libasm4-java,
@@ -22,7 +22,7 @@ Homepage: http://spockframework.org
 Package: libspock-java
 Architecture: all
 Depends: ant,
-         groovy,
+         groovy2,
          junit4,
          libaopalliance-java,
          libasm4-java,

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