[spock] 03/14: Refreshed the patch

[Emmanuel Bourg]

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

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

commit 40cb4f22a85ce83b3f260964595ae980d3688fef
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Oct 1 10:48:18 2015 +0200

    Refreshed the patch
---
 debian/changelog                    |  4 +++-
 debian/patches/01-upgrade-asm.patch | 35 +++++++----------------------------
 2 files changed, 10 insertions(+), 29 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c57ead2..83fbb8d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
-spock (0.6-groovy-1.8-4) UNRELEASED; urgency=medium
+spock (0.7-groovy-2.0-1) UNRELEASED; urgency=medium
 
   * Team upload.
+  * New upstream release:
+    - Refreshed the patch
   * Updated debian/watch
 
  -- Emmanuel Bourg <ebourg at apache.org>  Thu, 01 Oct 2015 10:33:41 +0200
diff --git a/debian/patches/01-upgrade-asm.patch b/debian/patches/01-upgrade-asm.patch
index 02b6ebd..9940f0c 100644
--- a/debian/patches/01-upgrade-asm.patch
+++ b/debian/patches/01-upgrade-asm.patch
@@ -2,39 +2,18 @@ Description: Update to ASM 5
 Origin: backport, https://github.com/spockframework/spock/commit/83c2cc7
 --- a/spock-core/src/main/java/org/spockframework/buildsupport/EmptyAnnotationVisitor.java
 +++ b/spock-core/src/main/java/org/spockframework/buildsupport/EmptyAnnotationVisitor.java
-@@ -14,9 +14,14 @@
+@@ -14,12 +14,12 @@
  
  package org.spockframework.buildsupport;
  
+-import groovyjarjarasm.asm.Opcodes;
 +import org.objectweb.asm.Opcodes;
  import org.objectweb.asm.AnnotationVisitor;
  
--class EmptyAnnotationVisitor implements AnnotationVisitor {
-+class EmptyAnnotationVisitor extends AnnotationVisitor {
-+  public EmptyAnnotationVisitor() {
+ class EmptyAnnotationVisitor extends AnnotationVisitor {
+   public EmptyAnnotationVisitor() {
+-    super(Opcodes.ASM4);
 +    super(Opcodes.ASM5);
-+  }
-+
-   public void visit(String s, Object o) {}
- 
-   public void visitEnum(String s, String s1, String s2) {}
---- a/spock-core/src/main/java/org/spockframework/buildsupport/SpecClassFileVisitor.java
-+++ b/spock-core/src/main/java/org/spockframework/buildsupport/SpecClassFileVisitor.java
-@@ -18,12 +18,16 @@
- 
- import org.objectweb.asm.*;
- 
--class SpecClassFileVisitor implements ClassVisitor {
-+class SpecClassFileVisitor extends ClassVisitor {
-   private final AnnotationVisitor annVisitor = new EmptyAnnotationVisitor();
- 
-   private boolean hasSpecMetadataAnnotation = false;
-   private boolean isAbstract;
- 
-+  SpecClassFileVisitor() {
-+    super(Opcodes.ASM5);
-+  }
-+
-   public boolean isSpec() {
-     return hasSpecMetadataAnnotation;
    }
+ 
+   public void visit(String s, Object o) {}

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