[mvel] 37/42: 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 56716b0fc2166aef1a0f5c703ec56e26a1163656
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Jan 18 17:15:56 2016 +0100

    Refreshed the patches
---
 debian/changelog                         |  3 ++-
 debian/patches/java8-compatibility.patch | 18 ------------------
 debian/patches/series                    |  1 -
 debian/patches/use_system_asm.diff       |  8 ++++----
 4 files changed, 6 insertions(+), 24 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6ac4660..a272e00 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-mvel (2.1.0-1) UNRELEASED; urgency=medium
+mvel (2.2.1-1) UNRELEASED; urgency=medium
 
   * Team upload.
   * New upstream release.
     - Refreshed the patches
+    - Removed java8-compatibility.patch (fixed upstream)
     - Build depend on junit4 instead of junit
     - Enabled the bundle plugin
   * Build with the DH sequencer instead of CDBS
diff --git a/debian/patches/java8-compatibility.patch b/debian/patches/java8-compatibility.patch
deleted file mode 100644
index fc9dc79..0000000
--- a/debian/patches/java8-compatibility.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Fixes a compilation failure with Java 8
-Author: Emmanuel Bourg
-Forwarded: no
---- a/src/main/java/org/mvel2/util/JITClassLoader.java
-+++ b/src/main/java/org/mvel2/util/JITClassLoader.java
-@@ -45,11 +45,6 @@
-   }
- 
-   public Class<?> defineClassX(String className, byte[] b, int off, int len) {
--    if (sunJVM) {
--      return ((Unsafe) sunUnsafe).defineClass(className, b, off, len);
--    }
--    else {
--      return super.defineClass(className, b, off, len);
--    }
-+    return super.defineClass(className, b, off, len);
-   }
- }
diff --git a/debian/patches/series b/debian/patches/series
index 171a7cc..eec4d9e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 pom.diff
 use_system_asm.diff
-java8-compatibility.patch
diff --git a/debian/patches/use_system_asm.diff b/debian/patches/use_system_asm.diff
index 034cd3f..e094fa2 100644
--- a/debian/patches/use_system_asm.diff
+++ b/debian/patches/use_system_asm.diff
@@ -4,9 +4,9 @@ Author: Damien Raude-Morvan <drazzib at debian.org>
 Last-Update: 2010-02-24
 --- a/src/main/java/org/mvel2/optimizers/impl/asm/ASMAccessorOptimizer.java
 +++ b/src/main/java/org/mvel2/optimizers/impl/asm/ASMAccessorOptimizer.java
-@@ -18,10 +18,10 @@
- package org.mvel2.optimizers.impl.asm;
+@@ -19,10 +19,10 @@
  
+ import com.sun.org.apache.xpath.internal.compiler.OpCodes;
  import org.mvel2.*;
 -import org.mvel2.asm.ClassWriter;
 -import org.mvel2.asm.Label;
@@ -19,7 +19,7 @@ Last-Update: 2010-02-24
  import org.mvel2.ast.*;
  import org.mvel2.compiler.*;
  import org.mvel2.integration.GlobalListenerFactory;
-@@ -51,8 +51,8 @@
+@@ -52,8 +52,8 @@
  import static org.mvel2.DataConversion.convert;
  import static org.mvel2.MVEL.eval;
  import static org.mvel2.MVEL.isAdvancedDebugging;
@@ -30,7 +30,7 @@ Last-Update: 2010-02-24
  import static org.mvel2.ast.TypeDescriptor.getClassReference;
  import static org.mvel2.integration.GlobalListenerFactory.hasGetListeners;
  import static org.mvel2.integration.GlobalListenerFactory.notifyGetListeners;
-@@ -702,7 +702,7 @@
+@@ -700,7 +700,7 @@
      if (clazz.isPrimitive()) {
          mv.visitFieldInsn(GETSTATIC, toNonPrimitiveType(clazz).getName().replace(".", "/"), "TYPE", "Ljava/lang/Class;");
      } else {

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