[pkg-java] r18015 - in trunk/groovy/debian: . patches
Miguel Landaeta
nomadium at moszumanska.debian.org
Thu Apr 10 21:09:41 UTC 2014
Author: nomadium
Date: 2014-04-10 21:09:41 +0000 (Thu, 10 Apr 2014)
New Revision: 18015
Added:
trunk/groovy/debian/patches/0004-java8-compatibility.patch
Modified:
trunk/groovy/debian/changelog
trunk/groovy/debian/control
trunk/groovy/debian/copyright
trunk/groovy/debian/patches/series
Log:
Prepare 1.8.6-2 upload
* Add patch to allow builds with OpenJDK 8.
* Remove obsolete DMUA flag.
* Update my email address.
* Bump Standards-Version to 3.9.5. No changes were required.
* Update copyright file to 1.0 format.
Modified: trunk/groovy/debian/changelog
===================================================================
--- trunk/groovy/debian/changelog 2014-04-10 17:56:25 UTC (rev 18014)
+++ trunk/groovy/debian/changelog 2014-04-10 21:09:41 UTC (rev 18015)
@@ -1,3 +1,13 @@
+groovy (1.8.6-2) UNRELEASED; urgency=medium
+
+ * Add patch to allow builds with OpenJDK 8.
+ * Remove obsolete DMUA flag.
+ * Update my email address.
+ * Bump Standards-Version to 3.9.5. No changes were required.
+ * Update copyright file to 1.0 format.
+
+ -- Miguel Landaeta <nomadium at debian.org> Thu, 10 Apr 2014 15:45:02 -0300
+
groovy (1.8.6-1) unstable; urgency=low
* New upstream release.
Modified: trunk/groovy/debian/control
===================================================================
--- trunk/groovy/debian/control 2014-04-10 17:56:25 UTC (rev 18014)
+++ trunk/groovy/debian/control 2014-04-10 21:09:41 UTC (rev 18015)
@@ -2,18 +2,17 @@
Section: java
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-DM-Upload-Allowed: yes
-Uploaders: Torsten Werner <twerner at debian.org>, Varun Hiremath <varun at debian.org>, Ludovic Claude <ludovic.claude at laposte.net>, Miguel Landaeta <miguel at miguel.cc>
+Uploaders: Torsten Werner <twerner at debian.org>, Varun Hiremath <varun at debian.org>, Ludovic Claude <ludovic.claude at laposte.net>, Miguel Landaeta <nomadium at debian.org>
Build-Depends: debhelper (>= 7), cdbs
Build-Depends-Indep: maven-repo-helper, ant (>= 1.7.1), ant-optional, default-jdk, bzip2, libasm3-java,
libbsf-java, libcommons-cli-java (>= 1.2), libcommons-logging-java
(>= 1.0.3), junit4, libmockobjects-java (>= 0.09), libregexp-java (>=
1.2), libservlet2.5-java, libxstream-java, libjline-java, antlr,
tofrodos, ivy, libqdox-java, libjarjar-java, libjansi-java
-Standards-Version: 3.9.2
+Standards-Version: 3.9.5
Homepage: http://groovy.codehaus.org/
-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/groovy/
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/groovy/
+Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/groovy
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/groovy/
Package: groovy
Architecture: all
Modified: trunk/groovy/debian/copyright
===================================================================
--- trunk/groovy/debian/copyright 2014-04-10 17:56:25 UTC (rev 18014)
+++ trunk/groovy/debian/copyright 2014-04-10 21:09:41 UTC (rev 18015)
@@ -1,17 +1,16 @@
-Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=59
-Name: groovy
-Packager: Marcus Crafter <crafterm at debian.org>
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: groovy
+Upstream-Contact: Groovy Development Team <dev at groovy.codehaus.org>
Source: http://groovy.codehaus.org/
-X-Upstream-Authors: Groovy Development Team, dev at groovy.codehaus.org
Files: *
-Copyright: © 2003-2011 the original author or authors
+Copyright: 2003-2012 the original author or authors
License: Apache-2.0
On Debian systems the full text of the Apache-2.0 license can be found in
the /usr/share/common-licenses/Apache-2.0 file.
Files: src/main/org/codehaus/groovy/jsr223/*
-Copyright: © 2006 Sun Microsystems, Inc.
+Copyright: 2006 Sun Microsystems, Inc.
License: BSD
Redistribution and use in source and binary forms, with or without modification, are
permitted provided that the following conditions are met: Redistributions of source code
@@ -21,7 +20,7 @@
provided with the distribution. Neither the name of the Sun Microsystems nor the names of
is contributors may be used to endorse or promote products derived from this software
without specific prior written permission.
-
+ .
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
@@ -33,10 +32,11 @@
POSSIBILITY OF SUCH DAMAGE.
Files: debian/*
-Copyright: © 2009 Varun Hiremath <varun at debian.org>
- © 2009 Torsten Werner <twerner at debian.org>
- © 2009 Ludovic Claude <ludovic.claude at laposte.net>
- © 2010-2011 Miguel Landaeta <miguel at miguel.cc>
+Copyright: 2004-2005 Marcus Crafter <crafterm at debian.org>
+ 2008-2009 Varun Hiremath <varun at debian.org>
+ 2007-2009 Torsten Werner <twerner at debian.org>
+ 2009 Ludovic Claude <ludovic.claude at laposte.net>
+ 2010-2012,2014 Miguel Landaeta <nomadium at debian.org>
License: GPL-2
On Debian systems the full text of the GPL Version 2 license can be
found in the /usr/share/common-licenses/GPL-2 file.
Added: trunk/groovy/debian/patches/0004-java8-compatibility.patch
===================================================================
--- trunk/groovy/debian/patches/0004-java8-compatibility.patch (rev 0)
+++ trunk/groovy/debian/patches/0004-java8-compatibility.patch 2014-04-10 21:09:41 UTC (rev 18015)
@@ -0,0 +1,51 @@
+Description: Fix ambiguity errors during build with Java 8
+Author: Miguel Landaeta <nomadium at debian.org>
+Forwarded: no
+Last-Update: 2014-04-10
+
+--- groovy-1.8.6.orig/src/main/org/codehaus/groovy/vmplugin/v5/Java5.java
++++ groovy-1.8.6/src/main/org/codehaus/groovy/vmplugin/v5/Java5.java
+@@ -328,7 +328,7 @@ public class Java5 implements VMPlugin {
+ Method[] methods = clazz.getDeclaredMethods();
+ for (Method m : methods) {
+ ClassNode ret = makeClassNode(compileUnit, m.getGenericReturnType(), m.getReturnType());
+- Parameter[] params = makeParameters(compileUnit, m.getGenericParameterTypes(), m.getParameterTypes(), m.getParameterAnnotations());
++ org.codehaus.groovy.ast.Parameter[] params = makeParameters(compileUnit, m.getGenericParameterTypes(), m.getParameterTypes(), m.getParameterAnnotations());
+ ClassNode[] exceptions = makeClassNodes(compileUnit, m.getGenericExceptionTypes(), m.getExceptionTypes());
+ MethodNode mn = new MethodNode(m.getName(), m.getModifiers(), ret, params, exceptions, null);
+ setMethodDefaultValue(mn, m);
+@@ -338,7 +338,7 @@ public class Java5 implements VMPlugin {
+ }
+ Constructor[] constructors = clazz.getDeclaredConstructors();
+ for (Constructor ctor : constructors) {
+- Parameter[] params = makeParameters(compileUnit, ctor.getGenericParameterTypes(), ctor.getParameterTypes(), ctor.getParameterAnnotations());
++ org.codehaus.groovy.ast.Parameter[] params = makeParameters(compileUnit, ctor.getGenericParameterTypes(), ctor.getParameterTypes(), ctor.getParameterAnnotations());
+ ClassNode[] exceptions = makeClassNodes(compileUnit, ctor.getGenericExceptionTypes(), ctor.getExceptionTypes());
+ classNode.addConstructor(ctor.getModifiers(), params, exceptions, null);
+ }
+@@ -388,10 +388,10 @@ public class Java5 implements VMPlugin {
+ return back;
+ }
+
+- private Parameter[] makeParameters(CompileUnit cu, Type[] types, Class[] cls, Annotation[][] parameterAnnotations) {
+- Parameter[] params = Parameter.EMPTY_ARRAY;
++ private org.codehaus.groovy.ast.Parameter[] makeParameters(CompileUnit cu, Type[] types, Class[] cls, Annotation[][] parameterAnnotations) {
++ org.codehaus.groovy.ast.Parameter[] params = org.codehaus.groovy.ast.Parameter.EMPTY_ARRAY;
+ if (types.length > 0) {
+- params = new Parameter[types.length];
++ params = new org.codehaus.groovy.ast.Parameter[types.length];
+ for (int i = 0; i < params.length; i++) {
+ params[i] = makeParameter(cu, types[i], cls[i], parameterAnnotations[i], i);
+ }
+@@ -399,9 +399,9 @@ public class Java5 implements VMPlugin {
+ return params;
+ }
+
+- private Parameter makeParameter(CompileUnit cu, Type type, Class cl, Annotation[] annotations, int idx) {
++ private org.codehaus.groovy.ast.Parameter makeParameter(CompileUnit cu, Type type, Class cl, Annotation[] annotations, int idx) {
+ ClassNode cn = makeClassNode(cu, type, cl);
+- Parameter parameter = new Parameter(cn, "param" + idx);
++ org.codehaus.groovy.ast.Parameter parameter = new org.codehaus.groovy.ast.Parameter(cn, "param" + idx);
+ setAnnotationMetaData(annotations, parameter);
+ return parameter;
+ }
Modified: trunk/groovy/debian/patches/series
===================================================================
--- trunk/groovy/debian/patches/series 2014-04-10 17:56:25 UTC (rev 18014)
+++ trunk/groovy/debian/patches/series 2014-04-10 21:09:41 UTC (rev 18015)
@@ -1,3 +1,4 @@
0001-start-scripts.patch
0002-ant-build.diff.patch
0003-disable-bnd.diff.patch
+0004-java8-compatibility.patch
More information about the pkg-java-commits
mailing list