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

commit 89550cc4fa72088288d07ccd3d31c49e45f1b151
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed May 11 11:40:18 2016 +0200

    Depend on groovy instead of groovy2
---
 debian/changelog           | 7 +++++++
 debian/control             | 4 ++--
 debian/maven.rules         | 1 -
 debian/patches/build.patch | 2 +-
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 723885c..3b88da4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+jasperreports (6.1.1+dfsg-6) unstable; urgency=medium
+
+  * Team upload.
+  * Depend on groovy instead of groovy2
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Wed, 11 May 2016 12:02:19 +0200
+
 jasperreports (6.1.1+dfsg-5) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/control b/debian/control
index a92e82b..1b901c2 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Build-Depends:
  debhelper (>= 9),
  default-jdk,
  glassfish-javaee,
- groovy2,
+ groovy,
  javahelper,
  libantlr-java,
  libapache-poi-java,
@@ -70,7 +70,7 @@ Depends:
  libolap4j-java,
  ${misc:Depends}
 Suggests:
- groovy2,
+ groovy,
  libantlr-java,
  libapache-poi-java,
  libbatik-java (>= 1.8),
diff --git a/debian/maven.rules b/debian/maven.rules
index fdc9d3c..4f24bcc 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -15,7 +15,6 @@ s/org.apache.tomcat/javax.servlet/ servlet-api jar s/.*/2.5/ * *
 org.apache.velocity velocity jar s/.*/debian/ * *
 commons-logging s/commons-logging-api/commons-logging/ * s/.*/debian/ * *
 s/ant/org.apache.ant/ * * s/.*/debian/ * *
-org.codehaus.groovy * * s/.*/2.x/ * *
 s/org.mozilla/rhino/ s/rhino/js/ * s/.*/debian/ * *
 s/org.jfree/jfree/ * * s/.*/debian/ * *
 org.apache.lucene lucene-core * s/4\..*/4.10.x/ * *
diff --git a/debian/patches/build.patch b/debian/patches/build.patch
index 5db2231..65a0f77 100644
--- a/debian/patches/build.patch
+++ b/debian/patches/build.patch
@@ -43,7 +43,7 @@ index cfa2166..480b61f 100644
 +					<include name="**/commons-logging.jar"/>
 +					<include name="**/ecj.jar"/>
 +					<include name="**/glassfish-jpa.jar"/>
-+					<include name="**/groovy-all-2.x.jar"/>
++					<include name="**/groovy-all.jar"/>
 +					<include name="**/hibernate*.jar"/>
 +					<include name="**/httpcore.jar"/>
 +					<include name="**/httpclient.jar"/>

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