This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository stapler.
commit 542eb2138a68225e10d0037b54872f53eff8d06a Author: Emmanuel Bourg <[email protected]> Date: Sun Sep 14 11:25:34 2014 +0200 New upstream release (1.228) --- debian/changelog | 8 ++++++++ debian/control | 2 +- debian/maven.rules | 2 +- ...e-asm3.patch => 0005-revert-kohsuke-asm5.patch} | 23 ++++++++++++++-------- debian/patches/series | 2 +- 5 files changed, 26 insertions(+), 11 deletions(-) diff --git a/debian/changelog b/debian/changelog index fb5d58b..5ca3005 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +stapler (1.228-1) unstable; urgency=medium + + * Team upload. + * New upstream release + - Depend on libasm4-java instead of libasm3-java + + -- Emmanuel Bourg <[email protected]> Sun, 14 Sep 2014 11:24:43 +0200 + stapler (1.224-1) unstable; urgency=medium * Team upload. diff --git a/debian/control b/debian/control index e80c1d0..55d18e2 100644 --- a/debian/control +++ b/debian/control @@ -14,7 +14,7 @@ Build-Depends-Indep: groovy (>= 1.8.6-4~), junit4, libannotation-indexer-java, - libasm3-java, + libasm4-java, libcommons-beanutils-java, libcommons-discovery-java, libcommons-fileupload-java, diff --git a/debian/maven.rules b/debian/maven.rules index 54b92b2..f572b23 100644 --- a/debian/maven.rules +++ b/debian/maven.rules @@ -18,7 +18,7 @@ junit junit jar s/4\..*/4.x/ * * commons-collections commons-collections * s/3\..*/3.x/ * * -s/org.kohsuke/asm/ s/asm3/asm-all/ * s/.*/3.x/ * * +s/org.kohsuke/org.ow2.asm/ s/asm5/asm-all/ * s/.*/4.x/ * * org.codehaus.groovy * * s/.*/1.x/ * * s/javax.servlet/javax.servlet.jsp/ jsp-api jar s/2\..*/2.1/ * * javax.servlet servlet-api jar s/2\..*/2.5/ * * diff --git a/debian/patches/0005-revert-kohsuke-asm3.patch b/debian/patches/0005-revert-kohsuke-asm5.patch similarity index 59% rename from debian/patches/0005-revert-kohsuke-asm3.patch rename to debian/patches/0005-revert-kohsuke-asm5.patch index 9860da4..995e9d1 100644 --- a/debian/patches/0005-revert-kohsuke-asm3.patch +++ b/debian/patches/0005-revert-kohsuke-asm5.patch @@ -6,24 +6,31 @@ Subject: revert-kohsuke-asm3 core/src/main/java/org/kohsuke/stapler/ClassDescriptor.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) -diff --git a/core/src/main/java/org/kohsuke/stapler/ClassDescriptor.java b/core/src/main/java/org/kohsuke/stapler/ClassDescriptor.java -index 3c14446..967fd86 100644 --- a/core/src/main/java/org/kohsuke/stapler/ClassDescriptor.java +++ b/core/src/main/java/org/kohsuke/stapler/ClassDescriptor.java @@ -24,11 +24,11 @@ package org.kohsuke.stapler; import org.apache.commons.io.IOUtils; --import org.kohsuke.asm3.ClassReader; --import org.kohsuke.asm3.Label; --import org.kohsuke.asm3.MethodVisitor; --import org.kohsuke.asm3.Type; --import org.kohsuke.asm3.commons.EmptyVisitor; +-import org.kohsuke.asm5.ClassReader; +-import org.kohsuke.asm5.ClassVisitor; +-import org.kohsuke.asm5.Label; +-import org.kohsuke.asm5.MethodVisitor; +-import org.kohsuke.asm5.Type; +import org.objectweb.asm.ClassReader; ++import org.objectweb.asm.ClassVisitor; +import org.objectweb.asm.Label; +import org.objectweb.asm.MethodVisitor; +import org.objectweb.asm.Type; -+import org.objectweb.asm.commons.EmptyVisitor; import java.io.IOException; import java.io.InputStream; +@@ -45,7 +45,7 @@ + + import static java.util.logging.Level.FINE; + import static java.util.logging.Level.WARNING; +-import static org.kohsuke.asm5.Opcodes.ASM5; ++import static org.objectweb.asm.Opcodes.ASM5; + + /** + * Reflection information of a {@link Class}. diff --git a/debian/patches/series b/debian/patches/series index 82a1908..8422d68 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,5 @@ 0001-beanutils18-compat.patch 0003-fix-groovy-build.patch -0005-revert-kohsuke-asm3.patch +0005-revert-kohsuke-asm5.patch 0006-servlet25-compat.patch 0008-Drop-use-of-custom-doklet.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/stapler.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
