[mvel] 06/07: Refreshed the patches

[Emmanuel Bourg]

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

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

commit 7f859ee48835d2f5be82b387ce8b2323887f8143
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Oct 3 13:22:37 2016 +0200

    Refreshed the patches
---
 debian/changelog                   |  2 ++
 debian/patches/pom.diff            | 19 -------------------
 debian/patches/series              |  1 -
 debian/patches/use_system_asm.diff | 36 +++++++++++++++++++++++++++++-------
 4 files changed, 31 insertions(+), 27 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c1f531f..f6f5ad1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 mvel (2.2.7-2) UNRELEASED; urgency=medium
 
   * Team upload.
+  * New upstream release.
+    - Refreshed the patches
   * Depend on libasm-java (>= 5.0) instead of libasm4-java
   * Standards-Version updated to 3.9.8
   * Use secure Vcs-* URLs
diff --git a/debian/patches/pom.diff b/debian/patches/pom.diff
deleted file mode 100644
index 3a17e69..0000000
--- a/debian/patches/pom.diff
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: Add a dependency on asm 4.x
-Author: Damien Raude-Morvan <drazzib at debian.org>
-Forwarded: not-needed
---- a/pom.xml
-+++ b/pom.xml
-@@ -273,6 +273,13 @@
-         <!--<version>1.0.2.GA</version>-->
-         <!--<scope>test</scope>-->
-         <!--</dependency>        -->
-+
-+        <dependency>
-+            <groupId>org.ow2.asm</groupId>
-+            <artifactId>asm</artifactId>
-+            <version>4.x</version>
-+        </dependency>
-+
-     </dependencies>
- 
-     <distributionManagement>
diff --git a/debian/patches/series b/debian/patches/series
index eec4d9e..dc44fc9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-pom.diff
 use_system_asm.diff
diff --git a/debian/patches/use_system_asm.diff b/debian/patches/use_system_asm.diff
index 2637582..ab89655 100644
--- a/debian/patches/use_system_asm.diff
+++ b/debian/patches/use_system_asm.diff
@@ -1,7 +1,6 @@
-Description: Use system ASM 3.x instead of bundled (stripped) one
-Forwarded: no
+Description: Use system ASM instead of bundled (stripped) one
 Author: Damien Raude-Morvan <drazzib at debian.org>
-Last-Update: 2010-02-24
+Forwarded: no
 --- a/src/main/java/org/mvel2/optimizers/impl/asm/ASMAccessorOptimizer.java
 +++ b/src/main/java/org/mvel2/optimizers/impl/asm/ASMAccessorOptimizer.java
 @@ -23,10 +23,10 @@
@@ -19,18 +18,26 @@ Last-Update: 2010-02-24
  import org.mvel2.ast.FunctionInstance;
  import org.mvel2.ast.TypeDescriptor;
  import org.mvel2.ast.WithNode;
-@@ -74,8 +74,8 @@
+@@ -74,12 +74,12 @@
  import static org.mvel2.DataConversion.convert;
  import static org.mvel2.MVEL.eval;
  import static org.mvel2.MVEL.isAdvancedDebugging;
 -import static org.mvel2.asm.Opcodes.*;
--import static org.mvel2.asm.Type.*;
+-import static org.mvel2.asm.Type.getConstructorDescriptor;
+-import static org.mvel2.asm.Type.getDescriptor;
+-import static org.mvel2.asm.Type.getInternalName;
+-import static org.mvel2.asm.Type.getMethodDescriptor;
+-import static org.mvel2.asm.Type.getType;
 +import static org.objectweb.asm.Opcodes.*;
-+import static org.objectweb.asm.Type.*;
++import static org.objectweb.asm.Type.getConstructorDescriptor;
++import static org.objectweb.asm.Type.getDescriptor;
++import static org.objectweb.asm.Type.getInternalName;
++import static org.objectweb.asm.Type.getMethodDescriptor;
++import static org.objectweb.asm.Type.getType;
  import static org.mvel2.ast.TypeDescriptor.getClassReference;
  import static org.mvel2.integration.GlobalListenerFactory.hasGetListeners;
  import static org.mvel2.integration.GlobalListenerFactory.notifyGetListeners;
-@@ -723,7 +723,7 @@
+@@ -734,7 +734,7 @@
      if (clazz.isPrimitive()) {
          mv.visitFieldInsn(GETSTATIC, toNonPrimitiveType(clazz).getName().replace(".", "/"), "TYPE", "Ljava/lang/Class;");
      } else {
@@ -100,3 +107,18 @@ Last-Update: 2010-02-24
        }
        accessorCompilers.put("ASM", new ASMAccessorOptimizer());
      }
+--- a/pom.xml
++++ b/pom.xml
+@@ -244,6 +244,12 @@
+ 
+     <dependencies>
+         <dependency>
++            <groupId>org.ow2.asm</groupId>
++            <artifactId>asm</artifactId>
++            <version>debian</version>
++        </dependency>
++
++        <dependency>
+             <groupId>junit</groupId>
+             <artifactId>junit</artifactId>
+             <version>4.8.2</version>

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