[pkg-java] r18430 - in trunk/jardiff/debian: . patches

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2014-09-15 21:33:36 +0000 (Mon, 15 Sep 2014)
New Revision: 18430

Added:
   trunk/jardiff/debian/patches/02_fix_build_with_asm4.diff
Modified:
   trunk/jardiff/debian/changelog
   trunk/jardiff/debian/control
   trunk/jardiff/debian/jardiff.sh
   trunk/jardiff/debian/patches/series
   trunk/jardiff/debian/rules
Log:
Depend on libasm4-java instead of libasm3-java



Modified: trunk/jardiff/debian/changelog
===================================================================
--- trunk/jardiff/debian/changelog	2014-09-15 15:51:00 UTC (rev 18429)
+++ trunk/jardiff/debian/changelog	2014-09-15 21:33:36 UTC (rev 18430)
@@ -1,3 +1,10 @@
+jardiff (0.2-4) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Depend on libasm4-java instead of libasm3-java
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Mon, 15 Sep 2014 23:32:43 +0200
+
 jardiff (0.2-3) unstable; urgency=low
 
   * Team upload.

Modified: trunk/jardiff/debian/control
===================================================================
--- trunk/jardiff/debian/control	2014-09-15 15:51:00 UTC (rev 18429)
+++ trunk/jardiff/debian/control	2014-09-15 21:33:36 UTC (rev 18430)
@@ -4,7 +4,7 @@
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Damien Raude-Morvan <drazzib at debian.org>
 Build-Depends: cdbs, debhelper (>= 5), default-jdk, ant
-Build-Depends-Indep: libasm3-java, libcommons-cli-java
+Build-Depends-Indep: libasm4-java, libcommons-cli-java
 Standards-Version: 3.8.4
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/jardiff/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/jardiff/
@@ -12,7 +12,7 @@
 
 Package: jardiff
 Architecture: all
-Depends: ${misc:Depends}, default-jre-headless | java2-runtime-headless, libasm3-java, libcommons-cli-java, java-wrappers
+Depends: ${misc:Depends}, default-jre-headless | java2-runtime-headless, libasm4-java, libcommons-cli-java, java-wrappers
 Description: tool to visualise API differences between two JAR files
  Jardiff is a tool to help visualise API differences between two different
  versions of a project.

Modified: trunk/jardiff/debian/jardiff.sh
===================================================================
--- trunk/jardiff/debian/jardiff.sh	2014-09-15 15:51:00 UTC (rev 18429)
+++ trunk/jardiff/debian/jardiff.sh	2014-09-15 21:33:36 UTC (rev 18430)
@@ -7,7 +7,7 @@
 find_java_runtime all
 
 # Define our classpath
-find_jars jardiff commons-cli asm3 asm3-commons
+find_jars jardiff commons-cli asm4 asm4-commons
 
 # Run JarDiff
 run_java org.osjava.jardiff.Main $extra_args "$@"

Added: trunk/jardiff/debian/patches/02_fix_build_with_asm4.diff
===================================================================
--- trunk/jardiff/debian/patches/02_fix_build_with_asm4.diff	                        (rev 0)
+++ trunk/jardiff/debian/patches/02_fix_build_with_asm4.diff	2014-09-15 21:33:36 UTC (rev 18430)
@@ -0,0 +1,42 @@
+--- a/src/java/org/osjava/jardiff/ClassInfoVisitor.java
++++ b/src/java/org/osjava/jardiff/ClassInfoVisitor.java
+@@ -40,9 +40,10 @@
+ import java.util.HashMap;
+ import java.util.Map;
+ 
++import org.objectweb.asm.ClassVisitor;
+ import org.objectweb.asm.FieldVisitor;
+ import org.objectweb.asm.MethodVisitor;
+-import org.objectweb.asm.commons.EmptyVisitor;
++import org.objectweb.asm.Opcodes;
+ 
+ /**
+  * A reusable class which uses the ASM to build up ClassInfo about a 
+@@ -50,7 +51,7 @@
+  *
+  * @author <a href="mailto:antony at cyberiantiger.org">Antony Riley</a>
+  */
+-public class ClassInfoVisitor extends EmptyVisitor
++public class ClassInfoVisitor extends ClassVisitor
+ {
+     /**
+      * The class file version.
+@@ -92,6 +93,10 @@
+      * A map of field signature to a FieldInfo describing the field.
+      */
+     private Map fieldMap;
++
++    public ClassInfoVisitor() {
++        super(Opcodes.ASM5);
++    }
+     
+     /**
+      * Reset this ClassInfoVisitor so that it can be used to visit another
+@@ -141,6 +146,6 @@
+                                    String signature, Object value) {
+         fieldMap.put(name,
+                      new FieldInfo(access, name, desc, signature, value));
+-        return this;
++        return null;
+     }
+ }

Modified: trunk/jardiff/debian/patches/series
===================================================================
--- trunk/jardiff/debian/patches/series	2014-09-15 15:51:00 UTC (rev 18429)
+++ trunk/jardiff/debian/patches/series	2014-09-15 21:33:36 UTC (rev 18430)
@@ -1 +1,2 @@
 01_fix_build_with_asm3.diff
+02_fix_build_with_asm4.diff

Modified: trunk/jardiff/debian/rules
===================================================================
--- trunk/jardiff/debian/rules	2014-09-15 15:51:00 UTC (rev 18429)
+++ trunk/jardiff/debian/rules	2014-09-15 21:33:36 UTC (rev 18430)
@@ -9,7 +9,7 @@
 JAVA_HOME            := /usr/lib/jvm/default-java
 ANT_HOME             := /usr/share/ant
 
-DEB_JARS             := commons-cli asm3 asm3-commons
+DEB_JARS             := commons-cli asm4 asm4-commons
 
 DEB_ANT_BUILD_TARGET := jar
 DEB_ANT_CLEAN_TARGET := clean