This is an automated email from the git hooks/post-receive script. apo pushed a commit to branch master in repository mvel.
commit 2bfc315b3e71076cd803b8fb58b95c1f78335f65 Author: Markus Koschany <a...@debian.org> Date: Sat Dec 2 00:05:33 2017 +0100 Refresh use_system_asm.diff --- debian/changelog | 1 + debian/patches/use_system_asm.diff | 16 ++++++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index 742b51f..27c6152 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ mvel (2.4.0-1) unstable; urgency=medium * Declare compliance with Debian Policy 4.1.2. * Remove --has-package-version flag. * d/copyright: Use https for Format field. + * Refresh use_system_asm.diff. -- Markus Koschany <a...@debian.org> Sat, 02 Dec 2017 00:03:58 +0100 diff --git a/debian/patches/use_system_asm.diff b/debian/patches/use_system_asm.diff index ab89655..1ad8f44 100644 --- a/debian/patches/use_system_asm.diff +++ b/debian/patches/use_system_asm.diff @@ -3,7 +3,7 @@ Author: Damien Raude-Morvan <draz...@debian.org> 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 @@ +@@ -23,10 +23,10 @@ import org.mvel2.MVEL; import org.mvel2.OptimizationFailure; import org.mvel2.ParserContext; import org.mvel2.PropertyAccessException; @@ -18,7 +18,7 @@ Forwarded: no import org.mvel2.ast.FunctionInstance; import org.mvel2.ast.TypeDescriptor; import org.mvel2.ast.WithNode; -@@ -74,12 +74,12 @@ +@@ -74,12 +74,12 @@ import static org.mvel2.DataConversion.c import static org.mvel2.DataConversion.convert; import static org.mvel2.MVEL.eval; import static org.mvel2.MVEL.isAdvancedDebugging; @@ -37,7 +37,7 @@ Forwarded: no import static org.mvel2.ast.TypeDescriptor.getClassReference; import static org.mvel2.integration.GlobalListenerFactory.hasGetListeners; import static org.mvel2.integration.GlobalListenerFactory.notifyGetListeners; -@@ -734,7 +734,7 @@ +@@ -734,7 +734,7 @@ public class ASMAccessorOptimizer extend if (clazz.isPrimitive()) { mv.visitFieldInsn(GETSTATIC, toNonPrimitiveType(clazz).getName().replace(".", "/"), "TYPE", "Ljava/lang/Class;"); } else { @@ -74,7 +74,7 @@ Forwarded: no import org.mvel2.integration.VariableResolverFactory; --- a/src/test/java/org/mvel2/tests/core/PropertyHandlerTests.java +++ b/src/test/java/org/mvel2/tests/core/PropertyHandlerTests.java -@@ -3,9 +3,9 @@ +@@ -3,9 +3,9 @@ package org.mvel2.tests.core; import junit.framework.TestCase; import org.mvel2.MVEL; import org.mvel2.PropertyAccessor; @@ -86,16 +86,16 @@ Forwarded: no import org.mvel2.integration.*; import org.mvel2.optimizers.OptimizerFactory; -@@ -389,4 +389,4 @@ - - assertEquals("foobie", wo.getFieldValue("foo")); +@@ -416,4 +416,4 @@ public class PropertyHandlerTests extend + Serializable compiled = MVEL.compileExpression("prop"); + assertEquals("Property", MVEL.executeExpression(compiled, new C())); } -} \ No newline at end of file +} --- a/src/main/java/org/mvel2/optimizers/OptimizerFactory.java +++ b/src/main/java/org/mvel2/optimizers/OptimizerFactory.java -@@ -43,9 +43,9 @@ +@@ -43,9 +43,9 @@ public class OptimizerFactory { */ try { if (OptimizerFactory.class.getClassLoader() != null) { -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/mvel.git _______________________________________________ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits