[josm] 01/02: Use groovy instead of the deprecated groovy2.

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository josm.

commit 52bcb3b071a5909a071aeb8af8841a3b07f9b9dc
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri May 13 16:40:23 2016 +0200

    Use groovy instead of the deprecated groovy2.
---
 debian/changelog              | 7 +++++++
 debian/control                | 2 +-
 debian/patches/00-build.patch | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b9f07e0..80276e7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+josm (0.0.svn10168+dfsg-2) UNRELEASED; urgency=medium
+
+  * Use groovy instead of the deprecated groovy2.
+    (closes: #824189)
+
+ -- Bas Couwenberg <sebastic at debian.org>  Fri, 13 May 2016 16:39:39 +0200
+
 josm (0.0.svn10168+dfsg-1) unstable; urgency=medium
 
   * New hotfix tested snapshot.
diff --git a/debian/control b/debian/control
index ea85616..8b8de53 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Build-Depends: debhelper (>= 9~),
                ant-contrib,
                javacc,
                gettext,
-               groovy2,
+               groovy,
                libcommons-compress-java,
                libcommons-logging-java,
                libgettext-ant-tasks-java,
diff --git a/debian/patches/00-build.patch b/debian/patches/00-build.patch
index 5cf6ad9..a20ee43 100644
--- a/debian/patches/00-build.patch
+++ b/debian/patches/00-build.patch
@@ -15,7 +15,7 @@ Forwarded: not-needed
          <property name="epsg.output" location="${base.dir}/data/projection/custom-epsg"/>
 -        <property name="groovy.jar" location="${base.dir}/tools/groovy-all-2.4.6.jar"/>
 +        <property name="antcontrib.jar" value="/usr/share/java/ant-contrib.jar"/>
-+        <property name="groovy.jar" location="/usr/share/java/groovy-all-2.x.jar"/>
++        <property name="groovy.jar" location="/usr/share/java/groovy-all.jar"/>
          <!-- build parameter: compression level (ant -Dclevel=N)
                   N ranges from 0 (no compression) to 9 (maximum compression)
                   default: 9 -->

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