[libjson-java] 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 libjson-java.

commit d2cce69c97899fe649847ab38c9b3812f2541f75
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed May 11 11:32:03 2016 +0200

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

diff --git a/debian/changelog b/debian/changelog
index 170623b..058b924 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libjson-java (2.4-3) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Depend on groovy instead of groovy2
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Wed, 11 May 2016 11:31:47 +0200
+
 libjson-java (2.4-2) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/control b/debian/control
index 99f8a80..14ab209 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Torsten Werner <twerner at debian.org>,
            Varun Hiremath <varun at debian.org>,
            Emmanuel Bourg <ebourg at apache.org>
 Build-Depends: ant, cdbs, debhelper (>= 9), default-jdk
-Build-Depends-Indep: groovy2,
+Build-Depends-Indep: groovy,
                      junit,
                      libcommons-beanutils-java,
                      libcommons-collections3-java (>= 3.2.1-7~),
@@ -22,7 +22,7 @@ Homepage: http://json-lib.sourceforge.net
 
 Package: libjson-java
 Architecture: all
-Depends: groovy2,
+Depends: groovy,
          libcommons-beanutils-java,
          libcommons-collections3-java (>= 3.2.1-7~),
          libcommons-lang-java,
diff --git a/debian/rules b/debian/rules
index c4d2d69..31a2c83 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 
 JAVA_HOME         := /usr/lib/jvm/default-java
 DEB_ANT_BUILDFILE := debian/build.xml
-DEB_JARS          := groovy-2.x commons-lang oro commons-beanutils commons-logging \
+DEB_JARS          := groovy commons-lang oro commons-beanutils commons-logging \
   commons-collections3 ezmorph xom junit
 
 install/libjson-java:: 

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