[pkg-java] r9363 - in trunk/commons-jci/debian: . patches

Damien Raude-Morvan drazzib-guest at alioth.debian.org
Thu Jul 16 15:50:10 UTC 2009 

Author: drazzib-guest
Date: 2009-07-16 15:50:10 +0000 (Thu, 16 Jul 2009)
New Revision: 9363

Added:
   trunk/commons-jci/debian/patches/01_janino_version_change.diff
   trunk/commons-jci/debian/patches/series
Removed:
   trunk/commons-jci/debian/patches/00list
   trunk/commons-jci/debian/patches/01_janino_version_change.dpatch
Modified:
   trunk/commons-jci/debian/changelog
   trunk/commons-jci/debian/control
   trunk/commons-jci/debian/rules
Log:
[commons-jci]

  * Upload to unstable as Lenny is now released
  * Set Maintainer field to Debian Java Team
  * Add myself as Uploaders
  * Switch to Quilt patch system:
    - Refresh all patches
    - Remove B-D on dpatch, Add B-D on quilt
    - Include patchsys-quilt.mk in debian/rules
  * Bump Standards-Version 3.8.2:
    - Add a README.source to describe patch system
    - Move libcommons-jci-java-* to "java" section



Modified: trunk/commons-jci/debian/changelog
===================================================================
--- trunk/commons-jci/debian/changelog	2009-07-16 15:40:15 UTC (rev 9362)
+++ trunk/commons-jci/debian/changelog	2009-07-16 15:50:10 UTC (rev 9363)
@@ -1,11 +1,17 @@
 commons-jci (1.0-2) UNRELEASED; urgency=low
 
   * Upload to unstable as Lenny is now released
+  * Set Maintainer field to Debian Java Team
+  * Add myself as Uploaders
+  * Switch to Quilt patch system:
+    - Refresh all patches
+    - Remove B-D on dpatch, Add B-D on quilt
+    - Include patchsys-quilt.mk in debian/rules  
   * Bump Standards-Version 3.8.2:
-    - Add a README.source describing patch system
+    - Add a README.source to describe patch system
     - Move libcommons-jci-java-* to "java" section
 
- -- Damien Raude-Morvan <drazzib at drazzib.com>  Sun, 28 Jun 2009 20:18:00 +0200
+ -- Damien Raude-Morvan <drazzib at drazzib.com>  Thu, 16 Jul 2009 17:48:13 +0200
 
 commons-jci (1.0-1) experimental; urgency=low
 

Modified: trunk/commons-jci/debian/control
===================================================================
--- trunk/commons-jci/debian/control	2009-07-16 15:40:15 UTC (rev 9362)
+++ trunk/commons-jci/debian/control	2009-07-16 15:50:10 UTC (rev 9363)
@@ -1,9 +1,10 @@
 Source: commons-jci
-Maintainer: Damien Raude-Morvan <drazzib at drazzib.com>
+Maintainer: Debian Java maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Uploaders: Damien Raude-Morvan <drazzib at drazzib.com>
 Standards-Version: 3.8.2
 Section: java
 Priority: optional
-Build-Depends: openjdk-6-jdk, ant, debhelper (>= 5), cdbs, dpatch
+Build-Depends: openjdk-6-jdk, ant, debhelper (>= 5), cdbs, quilt
 Build-Depends-Indep: libcommons-io-java, libcommons-lang-java, libcommons-logging-java, libasm2-java, groovy, rhino, janino, libecj-java
 Homepage: http://commons.apache.org/jci/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/commons-jci

Deleted: trunk/commons-jci/debian/patches/00list
===================================================================
--- trunk/commons-jci/debian/patches/00list	2009-07-16 15:40:15 UTC (rev 9362)
+++ trunk/commons-jci/debian/patches/00list	2009-07-16 15:50:10 UTC (rev 9363)
@@ -1 +0,0 @@
-01_janino_version_change

Added: trunk/commons-jci/debian/patches/01_janino_version_change.diff
===================================================================
--- trunk/commons-jci/debian/patches/01_janino_version_change.diff	                        (rev 0)
+++ trunk/commons-jci/debian/patches/01_janino_version_change.diff	2009-07-16 15:50:10 UTC (rev 9363)
@@ -0,0 +1,45 @@
+Description: Upstream use Janino 2.5.10 whereas Debian include 2.5.15.
+ - 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
+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
+--- 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 @@
+ 
+ import org.apache.commons.jci.problems.CompilationProblem;
+ import org.codehaus.janino.Location;
+-import org.codehaus.janino.Scanner.LocatedException;
++import org.codehaus.janino.util.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 @@
+ 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.janino.UnitCompiler.ErrorHandler;
+ import org.codehaus.janino.util.ClassFile;
+ 
+@@ -148,7 +148,11 @@
+         final CompilingIClassLoader icl = new CompilingIClassLoader(pResourceReader, classFilesByName, pClassLoader);
+         for (int i = 0; i < pSourceNames.length; i++) {
+             log.debug("compiling " + pSourceNames[i]);
+-            icl.loadIClass(Descriptor.fromClassName(ConversionUtils.convertResourceToClassName(pSourceNames[i])));
++            try {
++                icl.loadIClass(Descriptor.fromClassName(ConversionUtils.convertResourceToClassName(pSourceNames[i])));
++            } catch (ClassNotFoundException e) {
++                log.error(e);
++            }
+         }
+         
+         // Store all fully compiled classes

Deleted: trunk/commons-jci/debian/patches/01_janino_version_change.dpatch
===================================================================
--- trunk/commons-jci/debian/patches/01_janino_version_change.dpatch	2009-07-16 15:40:15 UTC (rev 9362)
+++ trunk/commons-jci/debian/patches/01_janino_version_change.dpatch	2009-07-16 15:50:10 UTC (rev 9363)
@@ -1,51 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_janino_version_change.dpatch by Damien Raude-Morvan <drazzib at drazzib.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Upstream use Janino 2.5.10 whereas Debian include 2.5.15.
-## DP: - LocatedException package location has changed in 2.5.11
-## DP:   <http://issues.apache.org/jira/browse/JCI-53>
-## DP:   <http://www.janino.net/changelog.html>
-## DP: - For Janino 2.5.5 icl.loadIClass(Descriptor.fromClassName(pClasses[i])) now 
-## DP:   throws ClassNotFoundException.
-## DP:   <http://issues.apache.org/jira/browse/JCI-41>
-## DP:   <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>
-
- at DPATCH@
-diff -urNad trunk~/compilers/janino/src/main/java/org/apache/commons/jci/compilers/JaninoCompilationProblem.java trunk/compilers/janino/src/main/java/org/apache/commons/jci/compilers/JaninoCompilationProblem.java
---- trunk~/compilers/janino/src/main/java/org/apache/commons/jci/compilers/JaninoCompilationProblem.java	2007-06-14 22:23:18.000000000 +0200
-+++ trunk/compilers/janino/src/main/java/org/apache/commons/jci/compilers/JaninoCompilationProblem.java	2008-09-18 20:26:53.000000000 +0200
-@@ -19,7 +19,7 @@
- 
- import org.apache.commons.jci.problems.CompilationProblem;
- import org.codehaus.janino.Location;
--import org.codehaus.janino.Scanner.LocatedException;
-+import org.codehaus.janino.util.LocatedException;
- 
- /**
-  * Janino version of a CompilationProblem
-diff -urNad trunk~/compilers/janino/src/main/java/org/apache/commons/jci/compilers/JaninoJavaCompiler.java trunk/compilers/janino/src/main/java/org/apache/commons/jci/compilers/JaninoJavaCompiler.java
---- trunk~/compilers/janino/src/main/java/org/apache/commons/jci/compilers/JaninoJavaCompiler.java	2007-06-14 22:23:18.000000000 +0200
-+++ trunk/compilers/janino/src/main/java/org/apache/commons/jci/compilers/JaninoJavaCompiler.java	2008-09-18 20:29:15.000000000 +0200
-@@ -45,7 +45,7 @@
- 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.janino.UnitCompiler.ErrorHandler;
- import org.codehaus.janino.util.ClassFile;
- 
-@@ -148,7 +148,11 @@
-         final CompilingIClassLoader icl = new CompilingIClassLoader(pResourceReader, classFilesByName, pClassLoader);
-         for (int i = 0; i < pSourceNames.length; i++) {
-             log.debug("compiling " + pSourceNames[i]);
--            icl.loadIClass(Descriptor.fromClassName(ConversionUtils.convertResourceToClassName(pSourceNames[i])));
-+            try {
-+                icl.loadIClass(Descriptor.fromClassName(ConversionUtils.convertResourceToClassName(pSourceNames[i])));
-+            } catch (ClassNotFoundException e) {
-+                log.error(e);
-+            }
-         }
-         
-         // Store all fully compiled classes

Added: trunk/commons-jci/debian/patches/series
===================================================================
--- trunk/commons-jci/debian/patches/series	                        (rev 0)
+++ trunk/commons-jci/debian/patches/series	2009-07-16 15:50:10 UTC (rev 9363)
@@ -0,0 +1 @@
+01_janino_version_change.diff

Modified: trunk/commons-jci/debian/rules
===================================================================
--- trunk/commons-jci/debian/rules	2009-07-16 15:40:15 UTC (rev 9362)
+++ trunk/commons-jci/debian/rules	2009-07-16 15:50:10 UTC (rev 9363)
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/dpatch.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/class/ant.mk
 
 JAVA_HOME            := /usr/lib/jvm/java-6-openjdk/

More information about the pkg-java-commits mailing list