[pkg-java] r12576 - in trunk/libspring-2.5-java/debian: . patches

[Damien Raude-Morvan]

Author: drazzib
Date: 2010-06-16 19:19:03 +0000 (Wed, 16 Jun 2010)
New Revision: 12576

Modified:
   trunk/libspring-2.5-java/debian/README.Debian
   trunk/libspring-2.5-java/debian/changelog
   trunk/libspring-2.5-java/debian/control
   trunk/libspring-2.5-java/debian/patches/15_fix_build_with_asm3.diff
Log:
Describe asm2 -> asm3 transition in d/README.Debian and in
d/patches/15_fix_build_with_asm3.diff  

Modified: trunk/libspring-2.5-java/debian/README.Debian
===================================================================
--- trunk/libspring-2.5-java/debian/README.Debian	2010-06-16 19:13:52 UTC (rev 12575)
+++ trunk/libspring-2.5-java/debian/README.Debian	2010-06-16 19:19:03 UTC (rev 12576)
@@ -65,4 +65,7 @@
 Tiles 2.2 instead of Tiles 2.0
   see debian/patches/13_tiles_22.dpatch in debian diff
 
- -- Damien Raude-Morvan <drazzib at debian.org>  Wed, 23 Sep 2009 20:30:00 +0200
+ASM 3.x instead of ASM 2.x
+  see debian/patches/15_fix_build_with_asm3.diff
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Wed Jun 16 21:16:05 CEST 2010

Modified: trunk/libspring-2.5-java/debian/changelog
===================================================================
--- trunk/libspring-2.5-java/debian/changelog	2010-06-16 19:13:52 UTC (rev 12575)
+++ trunk/libspring-2.5-java/debian/changelog	2010-06-16 19:19:03 UTC (rev 12576)
@@ -8,8 +8,10 @@
 
   [ Damien Raude-Morvan ]
   * Upload to unstable
+  * Describe asm2 -> asm3 transition in d/README.Debian and in
+    d/patches/15_fix_build_with_asm3.diff  
 
- -- Damien Raude-Morvan <drazzib at debian.org>  Wed, 16 Jun 2010 20:07:14 +0200
+ -- Damien Raude-Morvan <drazzib at debian.org>  Wed, 16 Jun 2010 21:17:02 +0200
 
 libspring-2.5-java (2.5.6.SEC01-9) unstable; urgency=low
 

Modified: trunk/libspring-2.5-java/debian/control
===================================================================
--- trunk/libspring-2.5-java/debian/control	2010-06-16 19:13:52 UTC (rev 12575)
+++ trunk/libspring-2.5-java/debian/control	2010-06-16 19:19:03 UTC (rev 12576)
@@ -183,7 +183,7 @@
 Package: libspring-aspects-2.5-java
 Architecture: all
 Depends: ${misc:Depends}, openjdk-6-jre | java2-runtime
-Description: modular Java/J2EE application framework - ORM tools
+Description: modular Java/J2EE application framework - Bundled aspects
  Spring is a layered Java/J2EE application framework offering a lot of freedom
  to Java developers yet providing well documented and easy-to-use solutions for
  common practices in the industry.

Modified: trunk/libspring-2.5-java/debian/patches/15_fix_build_with_asm3.diff
===================================================================
--- trunk/libspring-2.5-java/debian/patches/15_fix_build_with_asm3.diff	2010-06-16 19:13:52 UTC (rev 12575)
+++ trunk/libspring-2.5-java/debian/patches/15_fix_build_with_asm3.diff	2010-06-16 19:19:03 UTC (rev 12576)
@@ -1,7 +1,8 @@
-Index: libspring-2.5-java-2.5.6.SEC01/src/org/springframework/core/LocalVariableTableParameterNameDiscoverer.java
-===================================================================
---- libspring-2.5-java-2.5.6.SEC01.orig/src/org/springframework/core/LocalVariableTableParameterNameDiscoverer.java	2010-06-14 18:47:23.000000000 +0530
-+++ libspring-2.5-java-2.5.6.SEC01/src/org/springframework/core/LocalVariableTableParameterNameDiscoverer.java	2010-06-14 18:48:21.000000000 +0530
+Description: compatibility fixes for ASM 3.x
+Author: Onkar Shinde <onkarshinde at gmail.com>
+Forwarded: no
+--- a/src/org/springframework/core/LocalVariableTableParameterNameDiscoverer.java
++++ b/src/org/springframework/core/LocalVariableTableParameterNameDiscoverer.java
 @@ -109,7 +109,7 @@
  	private ParameterNameDiscoveringVisitor visitMethod(Method method) throws IOException {
  		ClassReader classReader = getClassReader(method.getDeclaringClass());
@@ -20,10 +21,8 @@
  		return classVisitor;
  	}
  
-Index: libspring-2.5-java-2.5.6.SEC01/tiger/src/org/springframework/core/type/classreading/SimpleMetadataReader.java
-===================================================================
---- libspring-2.5-java-2.5.6.SEC01.orig/tiger/src/org/springframework/core/type/classreading/SimpleMetadataReader.java	2010-06-14 19:07:18.000000000 +0530
-+++ libspring-2.5-java-2.5.6.SEC01/tiger/src/org/springframework/core/type/classreading/SimpleMetadataReader.java	2010-06-14 19:07:48.000000000 +0530
+--- a/tiger/src/org/springframework/core/type/classreading/SimpleMetadataReader.java
++++ b/tiger/src/org/springframework/core/type/classreading/SimpleMetadataReader.java
 @@ -46,13 +46,13 @@
  
  	public ClassMetadata getClassMetadata() {