[mvel] 29/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 d493badc37b0be6aa8004c245b5b182cb7e8e73a
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Jan 18 16:09:33 2016 +0100

    Refreshed the patches
---
 debian/changelog                   |  5 ++++-
 debian/maven.ignoreRules           |  1 +
 debian/patches/pom.diff            |  2 +-
 debian/patches/use_system_asm.diff | 24 +++++++++++++++---------
 4 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b375639..90053de 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
-mvel (2.0.18-5) UNRELEASED; urgency=medium
+mvel (2.0.19-1) UNRELEASED; urgency=medium
 
+  * Team upload.
+  * New upstream release.
+    - Refreshed the patches
   * Build with the DH sequencer instead of CDBS
   * Moved the package to Git
   * Standards-Version updated to 3.9.6 (no changes)
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index b3554f7..09ecd5a 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -1,3 +1,4 @@
+
 org.apache.felix maven-bundle-plugin * * * *
 org.apache.maven.plugins maven-release-plugin * * * *
 org.apache.maven.wagon wagon-webdav * * * *
diff --git a/debian/patches/pom.diff b/debian/patches/pom.diff
index 18045c2..c168ee4 100644
--- a/debian/patches/pom.diff
+++ b/debian/patches/pom.diff
@@ -3,7 +3,7 @@ Author: Damien Raude-Morvan <drazzib at debian.org>
 Forwarded: not-needed
 --- a/pom.xml
 +++ b/pom.xml
-@@ -179,6 +179,13 @@
+@@ -175,6 +175,13 @@
          <!--<version>1.0.2.GA</version>-->
          <!--<scope>test</scope>-->
          <!--</dependency>        -->
diff --git a/debian/patches/use_system_asm.diff b/debian/patches/use_system_asm.diff
index 7cd9a6c..0301654 100644
--- a/debian/patches/use_system_asm.diff
+++ b/debian/patches/use_system_asm.diff
@@ -4,10 +4,10 @@ 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
-@@ -24,13 +24,13 @@
- import static org.mvel2.MVEL.eval;
- import static org.mvel2.MVEL.isAdvancedDebugging;
+@@ -18,10 +18,10 @@
+ package org.mvel2.optimizers.impl.asm;
  
+ import org.mvel2.*;
 -import org.mvel2.asm.ClassWriter;
 -import org.mvel2.asm.Label;
 -import org.mvel2.asm.MethodVisitor;
@@ -16,15 +16,21 @@ Last-Update: 2010-02-24
 +import org.objectweb.asm.Label;
 +import org.objectweb.asm.MethodVisitor;
 +import org.objectweb.asm.Opcodes;
- 
+ import org.mvel2.ast.Function;
+ import org.mvel2.ast.TypeDescriptor;
+ import org.mvel2.ast.WithNode;
+@@ -53,8 +53,8 @@
+ 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.objectweb.asm.Opcodes.*;
 +import static org.objectweb.asm.Type.*;
- 
- import org.mvel2.ast.Function;
- import org.mvel2.ast.TypeDescriptor;
-@@ -582,7 +582,7 @@
+ import static org.mvel2.ast.TypeDescriptor.getClassReference;
+ import static org.mvel2.integration.GlobalListenerFactory.hasGetListeners;
+ import static org.mvel2.integration.GlobalListenerFactory.notifyGetListeners;
+@@ -648,7 +648,7 @@
  
          mv = cw.visitMethod(ACC_PUBLIC, "getKnownEgressType", "()Ljava/lang/Class;", null, null);
          mv.visitCode();
@@ -80,7 +86,7 @@ Last-Update: 2010-02-24
 +}
 --- a/src/main/java/org/mvel2/optimizers/OptimizerFactory.java
 +++ b/src/main/java/org/mvel2/optimizers/OptimizerFactory.java
-@@ -44,7 +44,7 @@
+@@ -45,7 +45,7 @@
           * By default, activate the JIT if ASM is present in the classpath
           */
          try {

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