[Git][java-team/jarjar][master] Embed all the asm-commons classes (Closes: #919064)

[Emmanuel Bourg]

Emmanuel Bourg pushed to branch master at Debian Java Maintainers / jarjar


Commits:
18087329 by Emmanuel Bourg at 2019-01-22T14:14:07Z
Embed all the asm-commons classes (Closes: #919064)

- - - - -


2 changed files:

- debian/changelog
- debian/patches/0006-asm-compatibility.patch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+jarjar (1.4+svn142-10) unstable; urgency=medium
+
+  * Team upload.
+  * Embed all the asm-commons classes (Closes: #919064)
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Tue, 22 Jan 2019 14:34:45 +0100
+
 jarjar (1.4+svn142-9) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/patches/0006-asm-compatibility.patch
=====================================
@@ -5,15 +5,18 @@ Author: Emmanuel Bourg <ebourg at apache.org>
 Forwarded: no
 --- a/build.xml
 +++ b/build.xml
-@@ -97,7 +97,7 @@
+@@ -96,10 +96,7 @@
+         <jarjar jarfile="${jarfile}">
              <fileset dir="build/main"/>
              <zipfileset src="${asm.jar}"/>
-             <zipfileset src="${asm-commons.jar}">
+-            <zipfileset src="${asm-commons.jar}">
 -                <include name="org/objectweb/asm/commons/Remap*.class"/>
-+                <include name="org/objectweb/asm/commons/*Remap*.class"/>
-                 <include name="org/objectweb/asm/commons/LocalVariablesSorter.class"/>
-             </zipfileset>
+-                <include name="org/objectweb/asm/commons/LocalVariablesSorter.class"/>
+-            </zipfileset>
++            <zipfileset src="${asm-commons.jar}"/>
          	<keep pattern="com.tonicsystems.jarjar.Main"/>
+             <keep pattern="com.tonicsystems.jarjar.JarJarTask"/>
+             <rule pattern="com.tonicsystems.jarjar.util.**" result="com.tonicsystems.jarjar.ext_util. at 1"/>
 --- a/src/main/com/tonicsystems/jarjar/DepFindVisitor.java
 +++ b/src/main/com/tonicsystems/jarjar/DepFindVisitor.java
 @@ -25,7 +25,7 @@



View it on GitLab: https://salsa.debian.org/java-team/jarjar/commit/1808732905069364dc97ae7cb2666ad8c1795594

-- 
View it on GitLab: https://salsa.debian.org/java-team/jarjar/commit/1808732905069364dc97ae7cb2666ad8c1795594
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20190122/ec3bd42f/attachment.html>