This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository gant.
commit cbc3785addf9fa445b9cd08569987be952531b67 Author: Emmanuel Bourg <[email protected]> Date: Fri Jul 31 13:29:58 2015 +0200 Transition to Groovy 2 --- debian/ant.properties | 2 +- debian/build.xml | 5 +++-- debian/changelog | 1 + debian/control | 4 ++-- debian/rules | 11 ++++++----- 5 files changed, 13 insertions(+), 10 deletions(-) diff --git a/debian/ant.properties b/debian/ant.properties index 7a25940..ecf71ed 100644 --- a/debian/ant.properties +++ b/debian/ant.properties @@ -1 +1 @@ -environment.GROOVY_HOME=/usr/share/groovy/ +environment.GROOVY_HOME=/usr/share/groovy2/ diff --git a/debian/build.xml b/debian/build.xml index ce305ae..4561fc5 100644 --- a/debian/build.xml +++ b/debian/build.xml @@ -25,7 +25,7 @@ Author : Russel Winder <[email protected]> </description> <property name="gantVersion" value="1.9.11"/> - <property name="groovyVersion" value="1.8.6"/> + <property name="groovyVersion" value="2.2.2"/> <property name="mavenAntTaskVersion" value="2.1.3"/> <property name="ivyVersion" value="2.2.0"/> @@ -77,7 +77,8 @@ Author : Russel Winder <[email protected]> <target name="-initializeWithGroovyHome" if="groovyHomeIsSet"> <echo message="Building with the Groovy installation at $GROOVY_HOME (${environment.GROOVY_HOME})."/> <path id="groovyJarPathId"> - <fileset dir="${environment.GROOVY_HOME}/lib" includes="groovy-1.*.jar"/> + <fileset dir="${environment.GROOVY_HOME}/lib" includes="groovy-2.*.jar"/> + <fileset dir="${environment.GROOVY_HOME}/lib" includes="groovy-ant.jar"/> </path> <path id="compileJarSetPathId"> <path refid="groovyJarPathId"/> diff --git a/debian/changelog b/debian/changelog index a71155d..1627337 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ gant (1.9.11-1) UNRELEASED; urgency=medium * Team upload. * New upstream release - Removed 01_fix_ant_1.9_api_changes.diff (fixed upstream) + * Transition to Groovy 2 * debian/watch: Track the release tags on GitHub -- Emmanuel Bourg <[email protected]> Fri, 31 Jul 2015 12:20:15 +0200 diff --git a/debian/control b/debian/control index 8e7b92c..90b81c8 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Varun Hiremath <[email protected]>, Torsten Werner <[email protected]>, Miguel Landaeta <[email protected]> Build-Depends: cdbs, debhelper (>= 7) -Build-Depends-Indep: ant, groovy, default-jdk, libmaven-ant-tasks-java, +Build-Depends-Indep: ant, groovy2, default-jdk, libmaven-ant-tasks-java, maven2, libplexus-classworlds-java, libplexus-utils-java Standards-Version: 3.9.4 Homepage: http://gant.codehaus.org/ @@ -13,7 +13,7 @@ Vcs-Browser: http://anonscm.debian.org/cgit/pkg-java/gant.git Package: gant Architecture: all -Depends: ${misc:Depends}, default-jre-headless | java2-runtime-headless, groovy, +Depends: ${misc:Depends}, default-jre-headless | java2-runtime-headless, groovy2, ant Recommends: maven2 | maven, libmaven-ant-tasks-java Description: Groovy build framework based on scripting Ant tasks diff --git a/debian/rules b/debian/rules index fb203d7..ac61058 100755 --- a/debian/rules +++ b/debian/rules @@ -3,16 +3,17 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/ant.mk -JAVA_HOME := /usr/lib/jvm/default-java +JAVA_HOME := /usr/lib/jvm/default-java DEB_ANT_BUILDFILE := debian/build.xml DEB_ANT_BUILD_TARGET := package UPSTREAM_VERSION := $(shell echo $(DEB_UPSTREAM_VERSION) | sed -e's,+dak.*,,') +GROOVY_HOME=/usr/share/groovy2 install/gant:: - dh_install target_gant/gant-$(UPSTREAM_VERSION).jar /usr/share/groovy/lib/ - dh_link /usr/share/groovy/lib/gant-$(UPSTREAM_VERSION).jar /usr/share/java/gant.jar - install -D -m755 debian/gant.sh $(DEB_DESTDIR)/usr/share/groovy/bin/gant - dh_link /usr/share/groovy/bin/gant /usr/bin/gant + dh_install target_gant/gant-$(UPSTREAM_VERSION).jar $(GROOVY_HOME)/lib + dh_link $(GROOVY_HOME)/lib/gant-$(UPSTREAM_VERSION).jar /usr/share/java/gant.jar + install -D -m755 debian/gant.sh $(DEB_DESTDIR)/$(GROOVY_HOME)/bin/gant + dh_link $(GROOVY_HOME)/bin/gant /usr/bin/gant get-orig-source: uscan --force-download --rename -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/gant.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
