[polyglot-maven] 01/04: Depend on groovy instead of groovy2
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Wed May 11 07:50:04 UTC 2016
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository polyglot-maven.
commit fc9a680ee337cbefebc4639fd9e6f6a5d94a7772
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Wed May 11 09:15:42 2016 +0200
Depend on groovy instead of groovy2
---
debian/build.xml | 2 +-
debian/changelog | 7 +++++++
debian/control | 2 +-
debian/maven.rules | 2 --
4 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/debian/build.xml b/debian/build.xml
index 440664c..126d502 100644
--- a/debian/build.xml
+++ b/debian/build.xml
@@ -44,7 +44,7 @@
<path id="groovyc.classpath">
<fileset dir="/usr/share/java" includes="commons-cli.jar"/>
- <fileset dir="/usr/share/java" includes="groovy-all-2.x.jar"/>
+ <fileset dir="/usr/share/java" includes="groovy-all.jar"/>
</path>
<!--path id="clojurec.classpath">
diff --git a/debian/changelog b/debian/changelog
index b9804b2..72332e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+polyglot-maven (0.8~tobrien+git20120905-6) UNRELEASED; urgency=medium
+
+ * Team upload.
+ * Depend on groovy instead of groovy2
+
+ -- Emmanuel Bourg <ebourg at apache.org> Wed, 11 May 2016 09:09:43 +0200
+
polyglot-maven (0.8~tobrien+git20120905-5) unstable; urgency=medium
* Team upload.
diff --git a/debian/control b/debian/control
index fd7f286..a7495a6 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.or
Uploaders: Damien Raude-Morvan <drazzib at debian.org>
Build-Depends: debhelper (>= 9), default-jdk, maven-repo-helper (>= 1.5)
Build-Depends-Indep: ant,
- groovy2,
+ groovy,
junit4,
libcommons-cli-java,
libcommons-logging-java,
diff --git a/debian/maven.rules b/debian/maven.rules
index 2ce7251..69ce043 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -23,8 +23,6 @@ org.apache.maven maven-plugin-api jar s/.*/3.0.4/ * *
org.apache.maven maven pom s/.*/3.0.4/ * *
org.codehaus.plexus plexus-component-metadata maven-plugin s/.*/1.5.5/ * *
commons-logging s/commons-logging-api/commons-logging/ * s/.*/debian/ * *
-s/groovy/org.codehaus.groovy/ groovy* * s/.*/2.x/ * *
-org.codehaus.groovy groovy* * s/.*/2.x/ * *
org.sonatype.pmaven pmaven-common jar s/.*/debian/ * *
org.sonatype.pmaven pmaven-groovy jar s/.*/debian/ * *
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/polyglot-maven.git
More information about the pkg-java-commits
mailing list