[spock] 01/06: 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 spock.

commit 60c8cdc391727dcc6a94a2823cbf0d334ad974a4
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue May 10 21:39:54 2016 +0200

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

diff --git a/debian/build.xml b/debian/build.xml
index c513eb7..ca611bb 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-2.x.jar"/>
+    <fileset dir="/usr/share/java" includes="groovy-all.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 2ee8b74..ffbcd9b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+spock (0.7-groovy-2.0-2) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Depend on groovy instead of groovy2
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Tue, 10 May 2016 21:39:26 +0200
+
 spock (0.7-groovy-2.0-1) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/control b/debian/control
index 55b1d14..1cc7e1b 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: groovy2,
+Build-Depends-Indep: groovy,
                      junit4,
                      libaopalliance-java,
                      libasm4-java,
@@ -22,7 +22,7 @@ Homepage: http://spockframework.org
 Package: libspock-java
 Architecture: all
 Depends: ant,
-         groovy2,
+         groovy,
          junit4,
          libaopalliance-java,
          libasm4-java,

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