[gradle] 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 gradle.

commit a1374caa0cbf72f04c74ceead731a26f5247c463
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon May 2 23:00:14 2016 +0200

    Depend on groovy instead of groovy2
---
 debian/changelog         | 1 +
 debian/control           | 8 ++++----
 debian/patches/docs.diff | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e7dd95b..8fde8cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ gradle (2.10-3) UNRELEASED; urgency=medium
   * Removed the unused dependency on libclassworlds-java
   * Depend on libasm-java instead of libasm4-java
   * Depend on libcglib-nodep-java instead of libcglib3-java
+  * Depend on groovy instead of groovy2
 
  -- Emmanuel Bourg <ebourg at apache.org>  Sun, 24 Apr 2016 19:27:30 +0200
 
diff --git a/debian/control b/debian/control
index 7d037dd..1c9971d 100644
--- a/debian/control
+++ b/debian/control
@@ -15,8 +15,8 @@ Build-Depends: ant,
                docbook-xsl,
                findbugs,
                gradle (>= 2.5),
-               groovy2 (>= 2.3.10),
-               groovy2-doc,
+               groovy (>= 2.3.10),
+               groovy-doc,
                ivy,
                javahelper,
                junit4,
@@ -103,7 +103,7 @@ Description: Powerful build system for the JVM
 Package: libgradle-core-java
 Architecture: all
 Depends: ant,
-         groovy2 (>= 2.3.10),
+         groovy (>= 2.3.10),
          ivy,
          libasm-java (>= 5.0),
          libatinject-jsr330-api-java,
@@ -213,7 +213,7 @@ Package: gradle-doc
 Architecture: all
 Section: doc
 Depends: default-jdk-doc,
-         groovy2-doc,
+         groovy-doc,
          ${misc:Depends}
 Description: Powerful build system for the JVM - Documentations
  Gradle is a build tool with a focus on build automation and support for
diff --git a/debian/patches/docs.diff b/debian/patches/docs.diff
index 0215fd6..043908c 100644
--- a/debian/patches/docs.diff
+++ b/debian/patches/docs.diff
@@ -40,7 +40,7 @@ Last-Update: 2015-09-30
 -def javaApiUrl = "https://docs.oracle.com/javase/6/docs/api"
 -def groovyApiUrl = "http://docs.groovy-lang.org/docs/groovy-${versions.groovy}/html/gapi"
 +def javaApiUrl = "file:///usr/share/doc/default-jdk/api/"
-+def groovyApiUrl = "file:///usr/share/doc/groovy2/api/"
++def groovyApiUrl = "file:///usr/share/doc/groovy/api/"
 
  task javadocAll(type: Javadoc) {
      ext.stylesheetFile = file("src/docs/css/javadoc.css")

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