[libgpars-groovy-java] 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 libgpars-groovy-java.

commit 5f0604e2383e2ec72b738653e6d22ffb4a38f7c0
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu May 5 02:46:00 2016 +0200

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

diff --git a/debian/changelog b/debian/changelog
index 8227e12..af1ab0a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libgpars-groovy-java (1.2.1-6) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Depend on groovy instead of groovy2
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Thu, 05 May 2016 02:44:51 +0200
+
 libgpars-groovy-java (1.2.1-5) unstable; urgency=medium
 
   [ Emmanuel Bourg ]
diff --git a/debian/control b/debian/control
index 765ad49..86c80ba 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Priority: optional
 Build-Depends: debhelper (>= 9),
                default-jdk,
                maven-repo-helper,
-               groovy2 (>= 2.0.8~),
+               groovy (>= 2.0.8~),
                libnetty-3.9-java,
                libjsr166y-java (>= 1.7.0~),
                libjcsp-java,
@@ -20,7 +20,7 @@ Homepage: http://gpars.github.io
 
 Package: libgpars-groovy-java
 Architecture: all
-Depends: groovy2,
+Depends: groovy,
          libnetty-3.9-java,
          libjsr166y-java,
          libjcsp-java,
diff --git a/debian/rules b/debian/rules
index 3596bbd..5ebb4e0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,7 @@ export JAVA_HOME=/usr/lib/jvm/default-java
 	dh $@ --with maven_repo_helper --buildsystem=gradle
 
 override_dh_auto_build:
-	dh_auto_build -- --project-prop finalRelease=true -Pgpars_groovyVersion=2.x -x zipDoc -x zipSrc assemble documentation
+	dh_auto_build -- --project-prop finalRelease=true -x zipDoc -x zipSrc assemble documentation
 
 get-orig-source:
 	cd $(dir $(firstword $(MAKEFILE_LIST)))../ && \

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