[gradle-propdeps-plugin] 02/05: 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-propdeps-plugin.

commit ba0a6e246692fc139efadc06b08de5b026e0d13e
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu May 19 10:09:31 2016 +0200

    Depend on groovy instead of groovy2
---
 debian/changelog                                     |  1 +
 debian/control                                       |  2 +-
 debian/patches/04-groovy-compiler-dependencies.patch | 14 --------------
 debian/patches/series                                |  1 -
 4 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 585c330..574c38e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 gradle-propdeps-plugin (0.0.7-3) UNRELEASED; urgency=medium
 
   * Build with gradle-debian-helper
+  * Depend on groovy instead of groovy2
 
  -- Emmanuel Bourg <ebourg at apache.org>  Fri, 16 Oct 2015 12:22:25 +0200
 
diff --git a/debian/control b/debian/control
index 906a671..e4ac19e 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Emmanuel Bourg <ebourg at apache.org>
-Build-Depends: debhelper (>= 9), gradle-debian-helper, groovy2, default-jdk, maven-repo-helper
+Build-Depends: debhelper (>= 9), gradle-debian-helper, groovy, default-jdk, maven-repo-helper
 Standards-Version: 3.9.6
 Vcs-Git: git://anonscm.debian.org/pkg-java/gradle-propdeps-plugin.git
 Vcs-Browser: http://anonscm.debian.org/cgit/pkg-java/gradle-propdeps-plugin.git
diff --git a/debian/patches/04-groovy-compiler-dependencies.patch b/debian/patches/04-groovy-compiler-dependencies.patch
deleted file mode 100644
index fa192be..0000000
--- a/debian/patches/04-groovy-compiler-dependencies.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: Add an explicit dependency on Groovy to be able to compile the .groovy files
- (why is this needed exactly?)
-Author: Emmanuel Bourg <ebourg at apache.org>
-Forwarded: not-needed
---- a/build.gradle
-+++ b/build.gradle
-@@ -21,6 +21,7 @@
-     }
- 
-     dependencies {
-+        compile 'org.codehaus.groovy:groovy-all:2.x'
-         compile gradleApi()
-         compile localGroovy()
-     }
diff --git a/debian/patches/series b/debian/patches/series
index 228efe0..dc0857a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 01-disable-modules.patch
 02-ignore-build-info-extractor.patch
 03-use-local-repository.patch
-04-groovy-compiler-dependencies.patch

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