debian/ant.properties

-asm.jar=/usr/share/java/asm4.jar
-asm-commons.jar=/usr/share/java/asm4-commons.jar
+asm.jar=/usr/share/java/asm.jar
+asm-commons.jar=/usr/share/java/asm-commons.jar
 maven-plugin-api.jar=/usr/share/java/maven-plugin-api.jar
 ant.jar=/usr/share/java/ant.jar
 compile.source=1.5

debian/changelog

+jarjar (1.4+svn142-9) unstable; urgency=medium
+
+  * Team upload.
+  * Depend on libasm-java instead of libasm4-java (Closes: #906398)
+  * Standards-Version updated to 4.3.0
+  * Switch to debhelper level 11
+  * Use salsa.debian.org Vcs-* URLs
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Sun, 06 Jan 2019 00:37:41 +0100
+
 jarjar (1.4+svn142-8) unstable; urgency=medium
 
   * Team upload.

debian/compat

-10
+11

debian/control

@@ -4,19 +4,19 @@ Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
 Uploaders: Damien Raude-Morvan <drazzib@debian.org>
 Build-Depends: ant,
-               debhelper (>= 10~),
+               debhelper (>= 11),
                default-jdk,
-               libasm4-java,
+               libasm-java (>= 6.0~),
                maven-repo-helper
-Standards-Version: 4.1.0
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/jarjar.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/jarjar.git
+Standards-Version: 4.3.0
+Vcs-Git: https://salsa.debian.org/java-team/jarjar.git
+Vcs-Browser: https://salsa.debian.org/java-team/jarjar
 Homepage: http://code.google.com/p/jarjar/
 
 Package: libjarjar-java
 Architecture: all
 Depends: ${misc:Depends}
-Built-Using: libasm4-java (= ${asm:Version})
+Built-Using: asm (= ${asm:Version})
 Description: repackage third-party jars
  Utility that makes it easy to repackage Java libraries and embed them
  into your own distribution. This is useful for two reasons:

debian/patches/0006-asm-compatibility.patch

 Description: Fixes the compatibility with the latest version of ASM.
  Starting with ASM 5.1 the SignatureRemapper class must be included.
+ Starting with ASM 6.0 RemappingClassAdapter is deprecated in favor of ClassRemapper
 Author: Emmanuel Bourg <ebourg@apache.org>
 Forwarded: no
 --- a/build.xml
@@ -13,3 +14,120 @@ Forwarded: no
                  <include name="org/objectweb/asm/commons/LocalVariablesSorter.class"/>
              </zipfileset>
          	<keep pattern="com.tonicsystems.jarjar.Main"/>
+--- a/src/main/com/tonicsystems/jarjar/DepFindVisitor.java
++++ b/src/main/com/tonicsystems/jarjar/DepFindVisitor.java
+@@ -25,7 +25,7 @@
+ import org.objectweb.asm.Type;
+ import org.objectweb.asm.commons.*;
+ 
+-class DepFindVisitor extends RemappingClassAdapter
++class DepFindVisitor extends ClassRemapper
+ {
+     public DepFindVisitor(Map<String, String> classes, String source, DepHandler handler) throws IOException {
+         super(null, new DepFindRemapper(classes, source, handler));
+--- a/src/main/com/tonicsystems/jarjar/KeepProcessor.java
++++ b/src/main/com/tonicsystems/jarjar/KeepProcessor.java
+@@ -26,7 +26,7 @@
+ // TODO: this can probably be refactored into JarClassVisitor, etc.
+ class KeepProcessor extends Remapper implements JarProcessor
+ {
+-    private final ClassVisitor cv = new RemappingClassAdapter(new EmptyClassVisitor(), this);
++    private final ClassVisitor cv = new ClassRemapper(new EmptyClassVisitor(), this);
+     private final List<Wildcard> wildcards;
+     private final List<String> roots = new ArrayList<String>();
+     private final Map<String, Set<String>> depend = new HashMap<String, Set<String>>();
+--- a/src/main/com/tonicsystems/jarjar/util/RemappingClassTransformer.java
++++ b/src/main/com/tonicsystems/jarjar/util/RemappingClassTransformer.java
+@@ -18,11 +18,11 @@
+ 
+ import org.objectweb.asm.ClassVisitor;
+ import org.objectweb.asm.commons.Remapper;
+-import org.objectweb.asm.commons.RemappingClassAdapter;
++import org.objectweb.asm.commons.ClassRemapper;
+ 
+ import com.tonicsystems.jarjar.EmptyClassVisitor;
+ 
+-public class RemappingClassTransformer extends RemappingClassAdapter
++public class RemappingClassTransformer extends ClassRemapper
+ {
+     public RemappingClassTransformer(Remapper pr) {
+         super(new EmptyClassVisitor(), pr);
+--- a/src/main/com/tonicsystems/jarjar/EmptyClassVisitor.java
++++ b/src/main/com/tonicsystems/jarjar/EmptyClassVisitor.java
+@@ -28,23 +28,23 @@
+ public class EmptyClassVisitor extends ClassVisitor {
+ 
+     public EmptyClassVisitor() {
+-        super(Opcodes.ASM4);
++        super(Opcodes.ASM6);
+     }
+     
+     @Override
+     public MethodVisitor visitMethod(int access, String name, String desc,
+             String signature, String[] exceptions) {
+-        return new MethodVisitor(Opcodes.ASM4) {};
++        return new MethodVisitor(Opcodes.ASM6) {};
+     }
+     
+     @Override
+     public AnnotationVisitor visitAnnotation(String desc, boolean visible) {
+-        return new AnnotationVisitor(Opcodes.ASM4) {};
++        return new AnnotationVisitor(Opcodes.ASM6) {};
+     }
+     
+     @Override
+     public FieldVisitor visitField(int access, String name, String desc, String signature, Object value) {
+-        return new FieldVisitor(Opcodes.ASM4) {};
++        return new FieldVisitor(Opcodes.ASM6) {};
+     }
+ 
+ }
+--- a/src/main/com/tonicsystems/jarjar/StringReader.java
++++ b/src/main/com/tonicsystems/jarjar/StringReader.java
+@@ -24,7 +24,7 @@
+     private String className;
+ 
+     public StringReader() {
+-        super(Opcodes.ASM4);
++        super(Opcodes.ASM6);
+     }
+     
+     abstract public void visitString(String className, String value, int line);
+@@ -42,7 +42,7 @@
+ 
+     public FieldVisitor visitField(int access, String name, String desc, String signature, Object value) {
+         handleObject(value);
+-        return new FieldVisitor(Opcodes.ASM4){
++        return new FieldVisitor(Opcodes.ASM6){
+             @Override
+             public AnnotationVisitor visitAnnotation(String desc, boolean visible) {
+                 return StringReader.this.visitAnnotation(desc, visible);
+@@ -52,7 +52,7 @@
+     
+     @Override
+     public AnnotationVisitor visitAnnotation(String desc, boolean visible) {
+-        return new AnnotationVisitor(Opcodes.ASM4) {
++        return new AnnotationVisitor(Opcodes.ASM6) {
+             @Override
+             public void visit(String name, Object value) {
+                 handleObject(value);
+@@ -71,7 +71,7 @@
+     @Override
+     public MethodVisitor visitMethod(int access, String name, String desc,
+             String signature, String[] exceptions) {
+-        MethodVisitor mv = new MethodVisitor(Opcodes.ASM4){
++        MethodVisitor mv = new MethodVisitor(Opcodes.ASM6){
+             @Override
+             public void visitLdcInsn(Object cst) {
+                 handleObject(cst);
+--- a/src/main/com/tonicsystems/jarjar/util/GetNameClassWriter.java
++++ b/src/main/com/tonicsystems/jarjar/util/GetNameClassWriter.java
+@@ -25,7 +25,7 @@
+     private String className;
+     
+     public GetNameClassWriter(int flags) {
+-        super(Opcodes.ASM4,new ClassWriter(flags));
++        super(Opcodes.ASM6,new ClassWriter(flags));
+     }
+ 
+     public void visit(int version, int access, String name, String signature, String superName, String[] interfaces) {

debian/rules

 #!/usr/bin/make -f
 
-export CLASSPATH := /usr/share/java/asm4.jar:/usr/share/java/asm4-commons.jar
+export CLASSPATH := /usr/share/java/asm.jar:/usr/share/java/asm-commons.jar
 
 # Variable for the Built-Using field in the control file
-ASM_VERSION := $(shell dpkg-query -f '$${source:Version}' --show libasm4-java)
+ASM_VERSION := $(shell dpkg-query -f '$${source:Version}' --show libasm-java)
 
 %:
 	dh $@ --with maven-repo-helper
@@ -18,6 +18,3 @@ override_dh_gencontrol:
 override_dh_auto_clean:
 	dh_auto_clean
 	dh_auto_build -- clean
-
-get-orig-source:
-	uscan --download-current-version --force-download