[pkg-java] r17151 - in trunk/commons-jci/debian: . patches
Damien Raude-Morvan
drazzib at alioth.debian.org
Sat Aug 17 13:15:40 UTC 2013
Author: drazzib
Date: 2013-08-17 13:15:39 +0000 (Sat, 17 Aug 2013)
New Revision: 17151
Modified:
trunk/commons-jci/debian/changelog
trunk/commons-jci/debian/compat
trunk/commons-jci/debian/control
trunk/commons-jci/debian/patches/01_janino_version_change.diff
Log:
* Fix build with janino 2.6.x release:
- d/patches/01_janino_version_change.diff: Updated.
- d/control: Tighten dependencies to libjanino-java (>= 2.6.0).
* d/control: Wrap-and-sort.
* d/compat: Bump debhelper compat to 9.
Modified: trunk/commons-jci/debian/changelog
===================================================================
--- trunk/commons-jci/debian/changelog 2013-08-16 10:43:07 UTC (rev 17150)
+++ trunk/commons-jci/debian/changelog 2013-08-17 13:15:39 UTC (rev 17151)
@@ -1,3 +1,13 @@
+commons-jci (1.0-7) unstable; urgency=low
+
+ * Fix build with janino 2.6.x release:
+ - d/patches/01_janino_version_change.diff: Updated.
+ - d/control: Tighten dependencies to libjanino-java (>= 2.6.0).
+ * d/control: Wrap-and-sort.
+ * d/compat: Bump debhelper compat to 9.
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Fri, 16 Aug 2013 14:16:11 +0200
+
commons-jci (1.0-6) unstable; urgency=low
* Added a patch to compile with Eclipse JDT compiler 3.8 and later
Modified: trunk/commons-jci/debian/compat
===================================================================
--- trunk/commons-jci/debian/compat 2013-08-16 10:43:07 UTC (rev 17150)
+++ trunk/commons-jci/debian/compat 2013-08-17 13:15:39 UTC (rev 17151)
@@ -1 +1 @@
-7
+9
Modified: trunk/commons-jci/debian/control
===================================================================
--- trunk/commons-jci/debian/control 2013-08-16 10:43:07 UTC (rev 17150)
+++ trunk/commons-jci/debian/control 2013-08-17 13:15:39 UTC (rev 17151)
@@ -1,20 +1,32 @@
Source: commons-jci
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Damien Raude-Morvan <drazzib at debian.org>, Emmanuel Bourg <ebourg at apache.org>
+Uploaders: Damien Raude-Morvan <drazzib at debian.org>,
+ Emmanuel Bourg <ebourg at apache.org>
Standards-Version: 3.9.4
Section: java
Priority: optional
-Build-Depends: default-jdk, ant, debhelper (>= 7), cdbs, maven-ant-helper
-Build-Depends-Indep: libcommons-io-java, libcommons-lang-java, libcommons-logging-java,
- libasm3-java, groovy, librhino-java, janino, libecj-java, maven-repo-helper,
- default-jdk-doc
+Build-Depends: ant, cdbs, debhelper (>= 9), default-jdk, maven-ant-helper
+Build-Depends-Indep: default-jdk-doc,
+ groovy,
+ libasm3-java,
+ libcommons-io-java,
+ libcommons-lang-java,
+ libcommons-logging-java,
+ libecj-java,
+ libjanino-java (>= 2.6.0),
+ librhino-java,
+ maven-repo-helper
Homepage: http://commons.apache.org/jci/
Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/commons-jci/
Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/commons-jci/
Package: libcommons-jci-java
Architecture: all
-Depends: ${misc:Depends}, libcommons-io-java, libcommons-lang-java, libcommons-logging-java, libasm3-java
+Depends: libasm3-java,
+ libcommons-io-java,
+ libcommons-lang-java,
+ libcommons-logging-java,
+ ${misc:Depends}
Description: common Java interface for various compilers - Core and FAM
Commons JCI is a common Java compiler interface for various compilers.
.
@@ -28,7 +40,9 @@
Package: libcommons-jci-rhino-java
Architecture: all
-Depends: ${misc:Depends}, libcommons-jci-java (= ${source:Version}), librhino-java
+Depends: libcommons-jci-java (= ${source:Version}),
+ librhino-java,
+ ${misc:Depends}
Description: common Java interface for various compilers - Javascript
Commons JCI is a common Java compiler interface for various compilers.
.
@@ -42,7 +56,7 @@
Package: libcommons-jci-groovy-java
Architecture: all
-Depends: ${misc:Depends}, libcommons-jci-java (= ${source:Version}), groovy
+Depends: groovy, libcommons-jci-java (= ${source:Version}), ${misc:Depends}
Description: common Java interface for various compilers - Groovy
Commons JCI is a common Java compiler interface for various compilers.
.
@@ -56,7 +70,9 @@
Package: libcommons-jci-janino-java
Architecture: all
-Depends: ${misc:Depends}, libcommons-jci-java (= ${source:Version}), janino
+Depends: libcommons-jci-java (= ${source:Version}),
+ libjanino-java (>= 2.6.0),
+ ${misc:Depends}
Description: common Java interface for various compilers - Janino
Commons JCI is a common Java compiler interface for various compilers.
.
@@ -70,7 +86,7 @@
Package: libcommons-jci-eclipse-java
Architecture: all
-Depends: ${misc:Depends}, libcommons-jci-java (= ${source:Version}), libecj-java
+Depends: libcommons-jci-java (= ${source:Version}), libecj-java, ${misc:Depends}
Description: common Java interface for various compilers - Eclipse JDT
Commons JCI is a common Java compiler interface for various compilers.
.
@@ -82,22 +98,6 @@
.
This package contains Eclipse JDT compiler module of Commons JCI.
-#Package: libcommons-jci-jsr199-java
-#Architecture: all
-#Depends: ${misc:Depends}, libcommons-jci-java (= ${source:Version})
-#Description: common Java interface for various compilers - Java6 JSR199
-# Commons JCI is a common Java compiler interface for various compilers.
-# .
-# It can be used to either compile Java (or any other language that can be
-# compiled to Java classes like e.g. Groovy or Javascript) to Java.
-# .
-# It is integrated with a Java FAM (Filesystem Alteration Monitor)
-# that can be used with JCI compiling/reloading classloader.
-# .
-# This package contains Java6 JSR199 compiler module of Commons JCI.
-# .
-# Need a Java 6 compliant runtime environnement.
-
Package: libcommons-jci-java-doc
Architecture: all
Section: doc
Modified: trunk/commons-jci/debian/patches/01_janino_version_change.diff
===================================================================
--- trunk/commons-jci/debian/patches/01_janino_version_change.diff 2013-08-16 10:43:07 UTC (rev 17150)
+++ trunk/commons-jci/debian/patches/01_janino_version_change.diff 2013-08-17 13:15:39 UTC (rev 17151)
@@ -1,36 +1,61 @@
-Description: Upstream use Janino 2.5.10 whereas Debian include 2.5.15.
+Description: Upstream use Janino 2.5.10 whereas Debian include 2.6.1
- LocatedException package location has changed in 2.5.11 (JCI-53)
- For Janino 2.5.5 icl.loadIClass(Descriptor.fromClassName(pClasses[i])) now
throws ClassNotFoundException. (JCI-41)
-Forwarded: yes
+ - Since Janino 2.6.0 there many classes have been moved to commons-compiler.jar
+Forwarded: partial
Origin: upstream, http://www.janino.net/changelog.html
Bug: http://issues.apache.org/jira/browse/JCI-53
Origin: upstream, http://svn.apache.org/viewvc/commons/proper/jci/trunk/compilers/janino/src/main/java/org/apache/commons/jci/compilers/JaninoJavaCompiler.java?r1=565099&r2=565475
Bug: http://issues.apache.org/jira/browse/JCI-41
-Last-Update: 2009-07-16
+Last-Update: 2013-08-16
--- a/compilers/janino/src/main/java/org/apache/commons/jci/compilers/JaninoCompilationProblem.java
+++ b/compilers/janino/src/main/java/org/apache/commons/jci/compilers/JaninoCompilationProblem.java
-@@ -19,7 +19,7 @@
+@@ -18,8 +18,8 @@
+ package org.apache.commons.jci.compilers;
import org.apache.commons.jci.problems.CompilationProblem;
- import org.codehaus.janino.Location;
+-import org.codehaus.janino.Location;
-import org.codehaus.janino.Scanner.LocatedException;
-+import org.codehaus.janino.util.LocatedException;
++import org.codehaus.commons.compiler.Location;
++import org.codehaus.commons.compiler.LocatedException;
/**
* Janino version of a CompilationProblem
--- a/compilers/janino/src/main/java/org/apache/commons/jci/compilers/JaninoJavaCompiler.java
+++ b/compilers/janino/src/main/java/org/apache/commons/jci/compilers/JaninoJavaCompiler.java
-@@ -45,7 +45,7 @@
+@@ -34,18 +34,17 @@
+ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
+ import org.codehaus.janino.ClassLoaderIClassLoader;
+-import org.codehaus.janino.CompileException;
+-import org.codehaus.janino.DebuggingInformation;
++import org.codehaus.commons.compiler.CompileException;
+ import org.codehaus.janino.Descriptor;
+ import org.codehaus.janino.IClass;
+ import org.codehaus.janino.IClassLoader;
+ import org.codehaus.janino.Java;
+-import org.codehaus.janino.Location;
++import org.codehaus.commons.compiler.Location;
+ import org.codehaus.janino.Parser;
import org.codehaus.janino.Scanner;
import org.codehaus.janino.UnitCompiler;
import org.codehaus.janino.WarningHandler;
-import org.codehaus.janino.Scanner.LocatedException;
-+import org.codehaus.janino.util.LocatedException;
++import org.codehaus.commons.compiler.LocatedException;
import org.codehaus.janino.UnitCompiler.ErrorHandler;
import org.codehaus.janino.util.ClassFile;
-@@ -148,7 +148,11 @@
+@@ -112,7 +111,7 @@
+ }
+ });
+ log.debug("compile " + className);
+- final ClassFile[] classFiles = uc.compileUnit(DebuggingInformation.ALL);
++ final ClassFile[] classFiles = uc.compileUnit(true, true, true);
+ for (int i = 0; i < classFiles.length; i++) {
+ log.debug("compiled " + classFiles[i].getThisClassName());
+ classes.put(classFiles[i].getThisClassName(), classFiles[i].toByteArray());
+@@ -148,7 +147,11 @@
final CompilingIClassLoader icl = new CompilingIClassLoader(pResourceReader, classFilesByName, pClassLoader);
for (int i = 0; i < pSourceNames.length; i++) {
log.debug("compiling " + pSourceNames[i]);
More information about the pkg-java-commits
mailing list