Author: drazzib
Date: 2011-12-03 01:50:13 +0000 (Sat, 03 Dec 2011)
New Revision: 15485
Added:
trunk/aspectj/debian/patches/use_system_asm.diff
Modified:
trunk/aspectj/debian/changelog
trunk/aspectj/debian/patches/series
trunk/aspectj/debian/rules
Log:
* New upstream release.
* Updated Standards-Version to 3.9.2: no changes needed.
Modified: trunk/aspectj/debian/changelog
===================================================================
--- trunk/aspectj/debian/changelog 2011-12-02 16:13:00 UTC (rev 15484)
+++ trunk/aspectj/debian/changelog 2011-12-03 01:50:13 UTC (rev 15485)
@@ -1,3 +1,10 @@
+aspectj (1.6.12+dfsg-1) unstable; urgency=low
+
+ * New upstream release.
+ * Updated Standards-Version to 3.9.2: no changes needed.
+
+ -- Damien Raude-Morvan <draz...@debian.org> Sat, 03 Dec 2011 02:43:45 +0100
+
aspectj (1.6.11+dfsg-2) unstable; urgency=low
* Readd B-D on itself (libaspectj-java) since the bootstrap phase still
Modified: trunk/aspectj/debian/patches/series
===================================================================
--- trunk/aspectj/debian/patches/series 2011-12-02 16:13:00 UTC (rev 15484)
+++ trunk/aspectj/debian/patches/series 2011-12-03 01:50:13 UTC (rev 15485)
@@ -4,3 +4,4 @@
05_build_classpath.diff
ant_0_8_fix.diff
07_javadoc_links.diff
+use_system_asm.diff
Added: trunk/aspectj/debian/patches/use_system_asm.diff
===================================================================
--- trunk/aspectj/debian/patches/use_system_asm.diff
(rev 0)
+++ trunk/aspectj/debian/patches/use_system_asm.diff 2011-12-03 01:50:13 UTC
(rev 15485)
@@ -0,0 +1,34 @@
+Description: Use system ASM3 instead of AspectJ copy
+Author: Damien Raude-Morvan <draz...@debian.org>
+Last-Updated: 2011-11-23
+Forwarded: no
+Index:
b/org.aspectj/modules/weaver/src/org/aspectj/weaver/bcel/asm/AsmDetector.java
+===================================================================
+---
a/org.aspectj/modules/weaver/src/org/aspectj/weaver/bcel/asm/AsmDetector.java
++++
b/org.aspectj/modules/weaver/src/org/aspectj/weaver/bcel/asm/AsmDetector.java
+@@ -24,8 +24,8 @@
+
+ static {
+ try {
+- Class<?> reader =
Class.forName("aj.org.objectweb.asm.ClassReader");
+- Class<?> visitor =
Class.forName("aj.org.objectweb.asm.ClassVisitor");
++ Class<?> reader =
Class.forName("org.objectweb.asm.ClassReader");
++ Class<?> visitor =
Class.forName("org.objectweb.asm.ClassVisitor");
+ Method m = reader.getMethod("accept", new Class[] {
visitor, Integer.TYPE });
+ isAsmAround = m != null;
+ } catch (Exception e) {
+Index:
b/org.aspectj/modules/weaver/src/org/aspectj/weaver/bcel/asm/StackMapAdder.java
+===================================================================
+---
a/org.aspectj/modules/weaver/src/org/aspectj/weaver/bcel/asm/StackMapAdder.java
++++
b/org.aspectj/modules/weaver/src/org/aspectj/weaver/bcel/asm/StackMapAdder.java
+@@ -15,8 +15,8 @@
+ import org.aspectj.weaver.UnresolvedType;
+ import org.aspectj.weaver.World;
+
+-import aj.org.objectweb.asm.ClassReader;
+-import aj.org.objectweb.asm.ClassWriter;
++import org.objectweb.asm.ClassReader;
++import org.objectweb.asm.ClassWriter;
+
+ /**
+ * Uses asm to add the stack map attribute to methods in a class. The class
is passed in as pure byte data and then a reader/writer
Modified: trunk/aspectj/debian/rules
===================================================================
--- trunk/aspectj/debian/rules 2011-12-02 16:13:00 UTC (rev 15484)
+++ trunk/aspectj/debian/rules 2011-12-03 01:50:13 UTC (rev 15485)
@@ -76,6 +76,7 @@
# asm3
$(MKDIR) $(AJ_ASM_HOME)
$(LN_S) /usr/share/java/asm3.jar $(AJ_ASM_HOME)/asm-3.1.jar
+ $(LN_S) /usr/share/java/asm3.jar $(AJ_ASM_HOME)/asm-3.3.1.renamed.jar
# eclipse (JDT)
$(MKDIR) $(AJ_ECLIPSE_HOME)
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
