[logback] 01/02: 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 logback.

commit 0d260a0c83e5ba654833c08487dd31b85d9999fc
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri May 20 09:26:58 2016 +0200

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

diff --git a/debian/changelog b/debian/changelog
index a043b9d..01e817a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+logback (1:1.1.7-2) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Depend on groovy instead of groovy2
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Fri, 20 May 2016 09:10:43 +0200
+
 logback (1:1.1.7-1) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/control b/debian/control
index bbd35cb..be6c42c 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends: ant,
                cdbs,
                debhelper (>= 9),
                default-jdk,
-               groovy2,
+               groovy,
                libgeronimo-jms-1.1-spec-java,
                libjanino-java (>= 2.6.0),
                libjansi-java,
diff --git a/debian/rules b/debian/rules
index b356f83..21379f7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,7 @@ ANT_HOME             := /usr/share/ant
 # janino glassfish-mail = core module
 # slf4j-api glassfish-javaee = classic module
 # groovy asm3-all commons-cli antlr = classic module "gaffer"
-DEB_JARS             := janino javax.mail servlet-api-3.1 geronimo-jms_1.1_spec slf4j-api groovy-all-2.x asm3-all commons-cli antlr jansi
+DEB_JARS             := janino javax.mail servlet-api-3.1 geronimo-jms_1.1_spec slf4j-api groovy-all asm3-all commons-cli antlr jansi
 
 DEB_ANT_BUILD_TARGET := jar.all javadoc
 DEB_ANT_CLEAN_TARGET := clean

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