[knopflerfish-osgi] 01/03: Use the latest version of ASM only

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository knopflerfish-osgi.

commit cb8e4fa69d006308a133fe336d77ad38e590a3d5
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Oct 11 01:07:26 2016 +0200

    Use the latest version of ASM only
---
 debian/control                            |  2 +-
 debian/patches/50_asm_compatibility.patch | 41 +++++++++++++++++++++++++++++++
 debian/patches/series                     |  1 +
 debian/rules                              |  4 +--
 4 files changed, 45 insertions(+), 3 deletions(-)

diff --git a/debian/control b/debian/control
index 80f90dd..5a62f44 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: java
 Priority: extra
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Felix Natter <fnatter at gmx.net>
-Build-Depends-Indep: libasm-java (>= 5.0), libasm3-java, default-jdk
+Build-Depends-Indep: libasm-java (>= 5.0), default-jdk
 Build-Depends: debhelper (>= 9), ant
 Standards-Version: 3.9.8
 Vcs-Git: https://anonscm.debian.org/git/pkg-java/knopflerfish-osgi.git
diff --git a/debian/patches/50_asm_compatibility.patch b/debian/patches/50_asm_compatibility.patch
new file mode 100644
index 0000000..0098d43
--- /dev/null
+++ b/debian/patches/50_asm_compatibility.patch
@@ -0,0 +1,41 @@
+Description: Fixes the compatibility with the latest version of ASM
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: no
+--- a/ant/src/org/knopflerfish/ant/taskdefs/bundle/ClassAnalyserASM.java
++++ b/ant/src/org/knopflerfish/ant/taskdefs/bundle/ClassAnalyserASM.java
+@@ -54,7 +54,7 @@
+  * with data about the given class.
+  */
+ public class ClassAnalyserASM
+-  implements ClassVisitor
++  extends ClassVisitor
+ {
+ 
+   /**
+@@ -79,6 +79,7 @@
+   public ClassAnalyserASM(final BundlePackagesInfo bpInfo,
+                           final Task task)
+   {
++    super(org.objectweb.asm.Opcodes.ASM4);
+     this.bpInfo = bpInfo;
+     this.task   = task;
+   }
+--- a/ant/src/org/knopflerfish/ant/taskdefs/bundle/MethodAnalyserASM.java
++++ b/ant/src/org/knopflerfish/ant/taskdefs/bundle/MethodAnalyserASM.java
+@@ -45,7 +45,7 @@
+  * with data about the method it visits.
+  */
+ public class MethodAnalyserASM
+-  implements MethodVisitor
++  extends MethodVisitor
+ {
+ 
+   // The ClassAnalyserASM instance that this method analyzer is
+@@ -56,6 +56,7 @@
+ 
+   public MethodAnalyserASM(final ClassAnalyserASM ca, final String name)
+   {
++    super(org.objectweb.asm.Opcodes.ASM4);
+     this.ca     = ca;
+     this.methodName = name;
+   }
diff --git a/debian/patches/series b/debian/patches/series
index cdad66d..17d5241 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 10_build_asm.patch
 20_versioned_jar.patch
 40_ignore_android.patch
+50_asm_compatibility.patch
diff --git a/debian/rules b/debian/rules
index fa0396e..cd824f8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,9 +5,9 @@
 
 override_dh_auto_build:
 	mkdir -p osgi/framework/libs
-	ln -s /usr/share/java/asm3-all.jar osgi/framework/libs/asm-3.2.jar
+	ln -s /usr/share/java/asm-all.jar osgi/framework/libs/asm-3.2.jar
 
-	dh_auto_build -- -f ant/bundletasks.xml build_bundle_tasks -Dasm.jar=/usr/share/java/asm3-all.jar
+	dh_auto_build -- -f ant/bundletasks.xml build_bundle_tasks -Dasm.jar=/usr/share/java/asm-all.jar
 	dh_auto_build -- -f osgi/framework/build.xml jar
 
 	javadoc -locale en -encoding "UTF-8" -sourcepath osgi/framework/src -d api -subpackages org.knopflerfish:org.osgi

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/knopflerfish-osgi.git